diff --git a/kivy_ios/toolchain.py b/kivy_ios/toolchain.py
index 6041cc30..04e1a476 100755
--- a/kivy_ios/toolchain.py
+++ b/kivy_ios/toolchain.py
@@ -1493,14 +1493,7 @@ def update(self):
             logger.error("{} not found".format(filename))
             sys.exit(1)
 
-<<<<<<< HEAD
         recipes = self.recipes_names_from_paths(args.add_custom_recipes)
-=======
-        recipes = []
-        for p in args.add_custom_recipe:
-            _, name = split(p)
-            recipes.append(name)
->>>>>>> 11836c29162c9539824336b5090102acb3127ffc
 
         update_pbxproj(filename, pbx_frameworks=args.add_framework,
                        custom_recipes=recipes, custom_recipes_paths=args.add_custom_recipe)