diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html
index 3979498..a69ef8c 100644
--- a/public/Forwarder/warehousenote.html
+++ b/public/Forwarder/warehousenote.html
@@ -20,7 +20,6 @@
       <![endif]-->
 <!--[if !IE]><!-->
 <html lang="en">
-<<<<<<< HEAD
 <!--<![endif]-->
 <!-- BEGIN HEAD -->
 
@@ -110,99 +109,6 @@
         }
         @media (min-width: 992px) {
             .page-content-wrapper .page-content {
-=======
-    <!--<![endif]-->
-    <!-- BEGIN HEAD -->
-
-    <head>
-        <meta charset="utf-8" />
-        <title>IZYIM | Departure Warehouse Receive Note</title> 
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta content="width=device-width, initial-scale=1" name="viewport" />
-        <meta content="Preview page of Metronic Admin Theme #1 for statistics, charts, recent events and reports" name="description" />
-        <meta content="" name="author" />
-        <!-- BEGIN GLOBAL MANDATORY STYLES -->
-        <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
-        <!-- END GLOBAL MANDATORY STYLES -->
-        <!-- BEGIN PAGE LEVEL PLUGINS -->
-        <link href="../assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
-        <!-- END PAGE LEVEL PLUGINS -->
-        <link href="../assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/bootstrap-editable/inputs-ext/address/address.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
-        <!-- BEGIN THEME GLOBAL STYLES -->
-        <link href="../assets/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
-        <link href="../assets/global/css/plugins.min.css" rel="stylesheet" type="text/css" />
-        <!-- END THEME GLOBAL STYLES -->
-        <!-- BEGIN THEME LAYOUT STYLES -->
-        <link href="../assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/layouts/layout/css/layout.min.css" rel="stylesheet" type="text/css" />
-        <link href="../assets/layouts/layout/css/themes/darkblue.min.css" rel="stylesheet" type="text/css" id="style_color" />
-        <link href="../assets/layouts/layout/css/custom.min.css" rel="stylesheet" type="text/css" />
-        <!-- END THEME LAYOUT STYLES -->
-        <style>
-            div.dt-button-collection {
-                margin-top: 70px;
-            }
-            .table td, .table th {
-                font-size: 10px;
-                text-align:center;
-                vertical-align: middle;
-            }
-            .dataTables_wrapper .dataTables_filter {
-                float: left;
-                text-align: right;
-            }
-            .table thead tr th{
-                font-size: 10px;
-                text-align:center;
-                vertical-align: middle;
-            }
-            .filterIcon {
-                height: 10px;
-                width: 10px;
-            }
-            .modalFilter {
-                display: none;
-                height: auto;
-                position: absolute;
-                z-index: 10000001;
-                }
-            .modal-footer {
-                padding: 15px;
-                text-align: left;
-                border-top: 1px solid #e5e5e5;
-            }
-            .dt-buttons{
-                margin-top: 0px !important;
-                }
-            #mask {
-                display: none;
-                background: transparent;
-                position: fixed;
-                left: 0;
-                top: 0;
-                z-index: 1;
-                width: 100%;
-                height: 100%;
-                opacity: 1000;
-            }
-
-            @media (min-width: 992px) {
-                .page-content-wrapper .page-content {
->>>>>>> f30d2573155bcd9f646a8b9f076026439e206755
                 margin-left: 200px;
             }
         }
@@ -1419,4 +1325,4 @@
                     
 </body>
 
-</html>
\ No newline at end of file
+</html>  
\ No newline at end of file
