diff --git a/Areas/MMS/Controllers/MarineController.cs b/Areas/MMS/Controllers/MarineController.cs
index e857dd3..2fdb011 100644
--- a/Areas/MMS/Controllers/MarineController.cs
+++ b/Areas/MMS/Controllers/MarineController.cs
@@ -54,6 +54,10 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers
                 return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred while viewing the PDF. " + ex.Message);
             }
         }
+<<<<<<< HEAD
 
+=======
+        
+>>>>>>> refs/remotes/origin/misya
     }
 }