Resolved merge conflict

apps/cli/executables/alma_product_fetch/__init__.py

apps/cli/executables/alma_reingester/__init__.py

apps/cli/executables/datafetcher/__init__.py

apps/cli/executables/datafetcher/test/test_datafetcher.py

apps/cli/executables/datafetcher/test/testing_utils.py

apps/cli/executables/epilogue/__init__.py

apps/cli/executables/ingestion/__init__.py

apps/cli/executables/vlba_grabber/__init__.py

apps/cli/executables/weblog_thumbs/__init__.py

apps/cli/launchers/pymygdala/__init__.py

apps/cli/launchers/wf/__init__.py

apps/cli/utilities/datafinder/__init__.py

apps/cli/utilities/dumplogs/__init__.py

apps/cli/utilities/faultchecker/__init__.py

apps/cli/utilities/mr_books/__init__.py

apps/cli/utilities/mr_clean/__init__.py

apps/cli/utilities/proprietary_setter/__init__.py

apps/cli/utilities/proprietary_setter/setup.py

...ies/proprietary_setter/src/proprietary_setter/commands.py

...prietary_setter/src/proprietary_setter/project_finders.py