fixing rebase conflict for 27th time

apps/cli/executables/datafetcher/datafetcher/project_fetcher.py

@@ -134,26 +134,17 @@ class ParallelFetcher(BaseFetcher):
     def fetch_bucket(self, bucket):
         """ Grab the files in this bucket """
         file_sizes = [file["size"] for file in bucket["files"]]
-<<<<<<< HEAD
         pprint(f"retrieving files {file_sizes} from {bucket['server']}")
-=======
-        pprint(f"retrieving files {file_sizes}")
->>>>>>> 9578688... Testing datafetcher fixes
         self._LOG.debug(
             f"{bucket['retrieve_method']} "
             f"{len(bucket['files'])} files from "
             f"{bucket['server']}...."
         )
-<<<<<<< HEAD
         num_files = self.retrieve_files(
             bucket["server"], bucket["retrieve_method"], bucket["files"]
         )
         print(f"done retrieving files {file_sizes} from {bucket['server']}")
         return num_files
-=======
-        self.retrieve_files(bucket["server"], bucket["retrieve_method"], bucket["files"])
-        print(f"done retrieving files {file_sizes}")
->>>>>>> 9578688... Testing datafetcher fixes
 
     def run(self):
         """ Fetch all the files for the product locator """