diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 0d47811..3e0aa4d 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -8,6 +8,7 @@
       "Bash(where:*)",
       "Bash(composer:*)",
       "Bash(curl:*)",
+<<<<<<< HEAD
       "Bash(C:xamppphpphp.exe phpunit.phar --testdox)",
       "Bash(php phpunit.phar:*)",
       "Bash(ls -la \"c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\autoload\"\" 2>nul | findstr /i \"admin Admin \")",
@@ -21,6 +22,12 @@
       "Bash(powershell.exe -Command \"Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::OpenRead\\(''c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\updates\\\\0.20\\\\ver_0.239.zip''\\).Entries | ForEach-Object { Write-Host $_.FullName }\")",
       "Bash(powershell.exe -NoProfile -Command 'Add-Type -AssemblyName System.IO.Compression.FileSystem; $z = [System.IO.Compression.ZipFile]::OpenRead\\(\"\"c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\updates\\\\0.20\\\\ver_0.239.zip\"\"\\); foreach \\($e in $z.Entries\\) { $e.FullName }; $z.Dispose\\(\\)')",
       "Bash(powershell.exe -NoProfile -Command:*)"
+=======
+      "Bash(find:*)",
+      "Bash(php:*)",
+      "Bash(C:xamppphpphp.exe -v)",
+      "Bash(/c/xampp/php/php.exe:*)"
+>>>>>>> 471173f45b4ff731f785fbcf8fdc0483af3b4e54
     ]
   }
 }
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
index ff0291d..91b2f4d 100644
--- a/.phpunit.result.cache
+++ b/.phpunit.result.cache
@@ -1 +1,5 @@
-{"version":1,"defects":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":4,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testSaveInsertsNewBanner":3,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithRedis":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheRedisUnavailable":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithoutRedis":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheReturnStructure":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepositories":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheAjaxMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSaveMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewCallsSettingsRepository":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testCacheRepositoryInjected":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSettingsRepositoryInjected":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testControllerIsNotStatic":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodsHaveTypes":4},"times":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":0.001,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsRegularPrice":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsPromoPrice":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsRegularWhenPromoIsHigher":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetNameReturnsProductName":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetNameReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testFindReturnsBannerWithTranslations":0.003,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testFindReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testDeleteReturnsTrue":0.002,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testSaveInsertsNewBanner":0,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testCanBeInstantiated":0.001,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testHasSaveSettingsMethod":0,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testHasGetSettingsMethod":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithRedis":0.001,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheRedisUnavailable":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithoutRedis":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheReturnStructure":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepositories":0.001,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheAjaxMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSaveMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewCallsSettingsRepository":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testCacheRepositoryInjected":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSettingsRepositoryInjected":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testControllerIsNotStatic":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodsHaveTypes":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepository":0.001,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasClearCacheMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasClearCacheAjaxMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasSaveMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasViewMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testIsNotAbstract":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodReturnTypes":0}}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":1,"defects":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":4,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testSaveInsertsNewBanner":3,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithRedis":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheRedisUnavailable":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithoutRedis":4,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheReturnStructure":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepositories":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheAjaxMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSaveMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewMethodExists":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewCallsSettingsRepository":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testCacheRepositoryInjected":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSettingsRepositoryInjected":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testControllerIsNotStatic":4,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodsHaveTypes":4},"times":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":0.001,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsRegularPrice":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsPromoPrice":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsRegularWhenPromoIsHigher":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetPriceReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetNameReturnsProductName":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetNameReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testFindReturnsBannerWithTranslations":0.003,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testFindReturnsNullWhenNotFound":0,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testDeleteReturnsTrue":0.002,"Tests\\Unit\\Domain\\Banner\\BannerRepositoryTest::testSaveInsertsNewBanner":0,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testCanBeInstantiated":0.001,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testHasSaveSettingsMethod":0,"Tests\\Unit\\Domain\\Settings\\SettingsRepositoryTest::testHasGetSettingsMethod":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithRedis":0.001,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheRedisUnavailable":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheWithoutRedis":0,"Tests\\Unit\\Domain\\Cache\\CacheRepositoryTest::testClearCacheReturnStructure":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepositories":0.001,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testClearCacheAjaxMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSaveMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewMethodExists":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testViewCallsSettingsRepository":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testCacheRepositoryInjected":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testSettingsRepositoryInjected":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testControllerIsNotStatic":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodsHaveTypes":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testConstructorAcceptsRepository":0.001,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasClearCacheMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasClearCacheAjaxMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasSaveMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testHasViewMethod":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testIsNotAbstract":0,"Tests\\Unit\\admin\\Controllers\\SettingsControllerTest::testActionMethodReturnTypes":0}}
+=======
+{"version":1,"defects":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":4,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":4},"times":{"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsCorrectValue":0.004,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsNullWhenProductNotFound":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testFindReturnsProductData":0,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testUpdateQuantitySuccess":0.002,"Tests\\Unit\\Domain\\Product\\ProductRepositoryTest::testGetQuantityReturnsInteger":0}}
+>>>>>>> 471173f45b4ff731f785fbcf8fdc0483af3b4e54