diff --git a/awx/main/migrations/0036_v310_job_timeout.py b/awx/main/migrations/0041_v310_job_timeout.py
similarity index 96%
rename from awx/main/migrations/0036_v310_job_timeout.py
rename to awx/main/migrations/0041_v310_job_timeout.py
index 7bc5868ff8..447ed6d38b 100644
--- a/awx/main/migrations/0036_v310_job_timeout.py
+++ b/awx/main/migrations/0041_v310_job_timeout.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0035_v310_jobevent_uuid'),
+        ('main', '0040_v310_artifacts'),
     ]
 
     operations = [
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index ae83cf87ba..9c216fc526 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -257,11 +257,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
                 'playbook', 'credential', 'cloud_credential', 'network_credential', 'forks', 'schedule',
                 'limit', 'verbosity', 'job_tags', 'extra_vars', 'launch_type',
                 'force_handlers', 'skip_tags', 'start_at_task', 'become_enabled',
-<<<<<<< 887818cb8987d465e23f1ed0c5886473acdbfcda
-                'labels', 'survey_passwords', 'allow_simultaneous',]
-=======
-                'labels', 'survey_passwords', 'timeout']
->>>>>>> Implement timeout on job/job-template.
+                'labels', 'survey_passwords', 'allow_simultaneous', 'timeout']
 
     def resource_validation_data(self):
         '''