diff --git a/stages/splitmerge.py b/stages/splitmerge.py
index 62d12b937..1f273078a 100644
--- a/stages/splitmerge.py
+++ b/stages/splitmerge.py
@@ -28,15 +28,17 @@ def process(self, args, outputs):
         image_groups_file = os.path.join(args.project_path, "image_groups.txt")
         if 'split_image_groups_is_set' in args:
             image_groups_file = os.path.abspath(args.split_image_groups)
-
         if io.file_exists(image_groups_file):
             outputs['large'] = True
+            if args.split < 999999:
+                args.split = 999999
+                log.ODM_WARNING('image_groups.txt and split both set. Using groups in image_groups.txt.')
         elif len(photos) > args.split:
             # check for availability of geotagged photos
             if reconstruction.has_geotagged_photos():
                 outputs['large'] = True
-            else:
-                log.ODM_WARNING('Could not perform split-merge as GPS information in photos or image_groups.txt is missing.')
+        else:
+            log.ODM_WARNING('Could not perform split-merge as GPS information in photos or image_groups.txt is missing.')
 
         if outputs['large']:
             # If we have a cluster address, we'll use a distributed workflow