Fix conflicts after merge

Mage/Command/BuiltIn/CompileCommand.php

@@ -21,13 +21,6 @@ use Mage\Compiler;
  */
 class CompileCommand extends AbstractCommand
 {
-    public function __construct()
-    {
-        $this->setName('Compile command')
-            ->setHelpMessage('Compiles Magallanes to mage.phar file')
-            ->setSyntaxMessage('mage compile');
-    }
-
     /**
      * @var Compiler
      */
@@ -40,6 +33,10 @@ class CompileCommand extends AbstractCommand
         }
 
         $this->compiler = $compiler;
+
+        $this->setName('Compile command')
+            ->setHelpMessage('Compiles Magallanes to mage.phar file')
+            ->setSyntaxMessage('mage compile');
     }
 
     /**