diff --git a/src/omero_cli_transfer.py b/src/omero_cli_transfer.py
index 3213e20..1d9fded 100644
--- a/src/omero_cli_transfer.py
+++ b/src/omero_cli_transfer.py
@@ -478,7 +478,6 @@ def __pack(self, args):
             print(f"Creating RO-Crate metadata at {md_fp}.")
             populate_rocrate(src_datatype, ome, os.path.splitext(tar_path)[0],
                              path_id_dict, folder)
-<<<<<<< HEAD
         if args.plugin:
             """
             Plugins for omero-cli-transfer can be created by providing
@@ -508,10 +507,7 @@ def __pack(self, args):
                     tmp_path=Path(folder),
                     image_filenames_mapping=path_id_dict,
                     conn=self.gateway)
-        elif not args.server:
-=======
         elif args.binaries == "all":
->>>>>>> 2d1e011 (changes cli argument to)
             self._package_files(os.path.splitext(tar_path)[0], args.zip,
                                 folder)
             print("Cleaning up...")