diff --git a/src/Downloader.php b/src/Downloader.php
index 0c55ce836..02c62216e 100644
--- a/src/Downloader.php
+++ b/src/Downloader.php
@@ -51,11 +51,7 @@ class Downloader
     private $enabled = true;
     private $composer;
 
-<<<<<<< HEAD
-    public function __construct(Composer $composer, IoInterface $io, HttpDownloader $rfs)
-=======
-    public function __construct(Composer $composer, IOInterface $io, $rfs)
->>>>>>> 1.x
+    public function __construct(Composer $composer, IOInterface $io, HttpDownloader $rfs)
     {
         if (getenv('SYMFONY_CAFILE')) {
             $this->caFile = getenv('SYMFONY_CAFILE');