diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json
index 31c7d4ba..20a81fb5 100644
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -2541,15 +2541,9 @@
           },
           "import-product.php": {
             "type": "-",
-<<<<<<< HEAD
             "size": 147,
             "lmtime": 1748902490178,
             "modified": true
-=======
-            "size": 151,
-            "lmtime": 1748942915279,
-            "modified": false
->>>>>>> 9fbe2fa613317433fc1d694bcd423e01558e1014
           },
           "index.php": {
             "type": "-",
diff --git a/import-product.php b/import-product.php
index 55c850a3..edc3bae8 100644
--- a/import-product.php
+++ b/import-product.php
@@ -2,7 +2,6 @@
 // Dołącz pliki konfiguracyjne PrestaShop
 include(dirname(__FILE__) . '/config/config.inc.php');
 include(dirname(__FILE__) . '/init.php');
-<<<<<<< HEAD
 
 libxml_use_internal_errors(true);
 $xmlString = file_get_contents( 'https://amz.com.pl/bazy-produktow-export/produkty-amz.xml' );
@@ -804,5 +803,3 @@ if ($productAdded || $combinationAdded) {
     // echo "<script>setTimeout(function(){location.reload();}, 250);</script>";
 }
 ?>
-=======
->>>>>>> 9fbe2fa613317433fc1d694bcd423e01558e1014