diff --git a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
index fa8ea74d1..f0c6b2385 100644
--- a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
+++ b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
@@ -606,11 +606,15 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildArchiveResponse()
     {
         $loadedArchiveResponse = $this->loadedZip
+<<<<<<< HEAD
 <<<<<<< HEAD
             ->buildArchiveResponse("test")
 =======
             ->buildArchiveResponse()
 >>>>>>> Define archive builders and formatters
+=======
+            ->buildArchiveResponse("test")
+>>>>>>> Fix Test
         ;
 
         $loadedArchiveResponseContent = $loadedArchiveResponse->getContent();