diff --git a/pbp/job_agent/main_job_agent_args.py b/pbp/job_agent/main_job_agent_args.py
index 39f31e7..79acac9 100644
--- a/pbp/job_agent/main_job_agent_args.py
+++ b/pbp/job_agent/main_job_agent_args.py
@@ -17,9 +17,11 @@ def parse_arguments():
         _type_: _description_
     """
 
+<<<<<<< Updated upstream
     description = "Deploys a job agent to process audio files and other data and provision pypam/pbp-generated resources. Each yaml file configuration argument spawns a new process. So keep in mind hardware constraints"
 =======
     description = "Deploys job agent(s) to process audio files using the pypam/pbp processing suite. This tool enables multiprocessing through 'job-agents' which can run concurrently. The agents are configured in .yaml files, and their paths can be provided as arguments via the --config option (without string quotes). See example below for further details."
+>>>>>>> Stashed changes
     example = """
     Example:
         pbp-job-agent --config /path/to/deployment/global_config_1.yaml /path/to/deployment/global_config_2.yaml