diff --git a/product_list.html b/product_list.html
index aa2d506..a911c07 100644
--- a/product_list.html
+++ b/product_list.html
@@ -777,8 +777,12 @@
             </div>
 
         </div>
+        <!-- end -->
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> tieptk
     </div>
     <!-- Script -->
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>
diff --git a/them_san_pham.html b/them_san_pham.html
index 6ac29e6..e55c3d4 100644
--- a/them_san_pham.html
+++ b/them_san_pham.html
@@ -759,6 +759,10 @@
         </div>
 
     </div>
+<<<<<<< HEAD
+=======
+    <!-- end -->
+>>>>>>> tieptk
 
     <!-- Script -->
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>