Resolve conflicts in index.md

doc/administration/operations/index.md

@@ -13,9 +13,6 @@ by GitLab to another file system or another server.
 that to prioritize important jobs.
 - [Sidekiq MemoryKiller](sidekiq_memory_killer.md): Configure Sidekiq MemoryKiller
 to restart Sidekiq.
-<<<<<<< HEAD
 - **(EES/EEP)** [Extra Sidekiq operations](extra_sidekiq_processes.md): Configure an extra set of Sidekiq processes to ensure certain queues always have dedicated workers, no matter the amount of jobs that need to be processed.
-=======
->>>>>>> upstream/master
 - [Unicorn](unicorn.md): Understand Unicorn and unicorn-worker-killer.
 - [Speed up SSH operations](fast_ssh_key_lookup.md): Authorize SSH users via a fast, indexed lookup to the GitLab database.