fix: resolve merge conflict in Sidebar component product routes

Author: xukki241

frontend/src/components/layout/Sidebar.jsx

@@ -67,11 +67,8 @@ const Sidebar = ({ collapsed, onToggleSidebar }) => {
       path: "/products",
       children: [
         { label: "Danh sách sản phẩm", path: "/products" },
-<<<<<<< HEAD
-=======
         { label: "Thêm sản phẩm", path: "/products/addproduct" },
         { label: "Danh mục & Brand", path: "/products/categories" },
->>>>>>> dev
         { label: "Thiết lập giá", path: "/products/price" },
         { label: "Combo sản phẩm", path: "/products/combo" },
       ],