diff --git a/src/Illuminate/Foundation/Console/ModelMakeCommand.php b/src/Illuminate/Foundation/Console/ModelMakeCommand.php
index 04284294be98..63668c40a8a6 100644
--- a/src/Illuminate/Foundation/Console/ModelMakeCommand.php
+++ b/src/Illuminate/Foundation/Console/ModelMakeCommand.php
@@ -133,19 +133,15 @@ protected function getDefaultNamespace($rootNamespace)
     protected function getOptions()
     {
         return [
-<<<<<<< HEAD
             ['all', 'a', InputOption::VALUE_NONE, 'Generate a migration, factory, and resource controller for the model'],
 
             ['controller', 'c', InputOption::VALUE_NONE, 'Create a new controller for the model'],
 
-            ['factory', 'f', InputOption::VALUE_NONE, 'Create a new factory for the model'],
-=======
+            ['factory', 'fa', InputOption::VALUE_NONE, 'Create a new factory for the model'],
+
             ['force', 'f', InputOption::VALUE_NONE, 'Create the class even if the model already exists.'],
 
             ['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model.'],
->>>>>>> 5.4
-
-            ['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model'],
 
             ['resource', 'r', InputOption::VALUE_NONE, 'Indicates if the generated controller should be a resource controller.'],
         ];