fix merge problems

crosspm/cpm.py

@@ -378,7 +378,7 @@ def command(self, command_):
         if command_ is Locker:
             do_load = self._config.recursive
 
-        cpm_ = command_(self._config, do_load, self.altsearch, self.altsearch_branch)
+        cpm_ = command_(self.altsearch, self.altsearch_branch, self._config, do_load)
         cpm_.entrypoint()
 
         if self._return_result:

crosspm/helpers/downloader.py

@@ -19,7 +19,7 @@ class Downloader(Command):
 
     altsearch = False
     altsearchbranch = ''
-    def __init__(self,altsearch, altsearchbranch, config: Config, do_load: bool, recursive: Optional[bool] = None):
+    def __init__(self, altsearch, altsearchbranch, config: Config, do_load: bool, recursive: Optional[bool] = None):
         self._log = logging.getLogger('crosspm')
         self._config = config  # type: Config
         self.cache = config.cache