diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html
index 8c96c18..3979498 100644
--- a/public/Forwarder/warehousenote.html
+++ b/public/Forwarder/warehousenote.html
@@ -20,6 +20,7 @@
+<<<<<<< HEAD
@@ -109,6 +110,99 @@
}
@media (min-width: 992px) {
.page-content-wrapper .page-content {
+=======
+
+
+
+
+
+ IZYIM | Departure Warehouse Receive Note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+