diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
index 4cee2676b..796be2fe1 100644
--- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
+++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
@@ -547,7 +547,7 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
          */
         $initialString = preg_replace("#\/{2,}#", "/", $initialString);
 
-        if (preg_match("#\/?[^\/]+\/[^/]+\/?#", $initialString)) {
+        if (preg_match("#\/?[^\/]+\/[^\/]+\/?#", $initialString)) {
             $initialString = "/" . $initialString;
         }
         return $initialString;
diff --git a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
index fb4f5c86b..cf65ea3d1 100644
--- a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
+++ b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
@@ -97,6 +97,7 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testAddValidFileFromString()
     {
+<<<<<<< HEAD
         $this->tar->addFileFromString(
 <<<<<<< HEAD
             "foo", "bar"
@@ -306,8 +307,9 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
 } 
 >>>>>>> Finish implementing and testing zip
 =======
+=======
+>>>>>>> Fix FileDownloader test
 
-        )
     }
 } 
 >>>>>>> Complete zip tests
diff --git a/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php b/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
index 457a8e634..263d67db7 100644
--- a/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
+++ b/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
@@ -15,10 +15,14 @@ use Symfony\Component\DependencyInjection\Container;
 use Thelia\Core\Translation\Translator;
 use Thelia\Log\Tlog;
 <<<<<<< HEAD
+<<<<<<< HEAD
 use Thelia\Tools\FileDownload\FileDownloader;
 =======
 use Thelia\Tools\FileDownloader;
 >>>>>>> Define archive builders and formatters
+=======
+use Thelia\Tools\FileDownload\FileDownloader;
+>>>>>>> Fix FileDownloader test
 
 /**
  * Class FileDownloaderTest