diff --git a/Areas/MMS/Controllers/MarineController.cs b/Areas/MMS/Controllers/MarineController.cs
index 2fdb011..5fce77d 100644
--- a/Areas/MMS/Controllers/MarineController.cs
+++ b/Areas/MMS/Controllers/MarineController.cs
@@ -8,8 +8,6 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers
 {
     [Area("MMS")]
 
-    //testing from main laptop
-
     //[Authorize(Policy = "RoleModulePolicy")]
     public class MarineController : Controller
     {
@@ -54,10 +52,5 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers
                 return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred while viewing the PDF. " + ex.Message);
             }
         }
-<<<<<<< HEAD
-
-=======
-        
->>>>>>> refs/remotes/origin/misya
     }
 }