Fix sidekiq_queues.yml

config/sidekiq_queues.yml

@@ -53,7 +53,7 @@
   - [pages, 1]
   - [system_hook_push, 1]
   - [update_user_activity, 1]
-<<<<<<< HEAD
+  - [propagate_service_template, 1]
   # EE specific queues
   - [geo, 1]
   - [project_mirror, 1]
@@ -64,7 +64,3 @@
   - [elastic_indexer, 1]
   - [elastic_commit_indexer, 1]
   - [export_csv, 1]
-
-=======
-  - [propagate_service_template, 1]
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284