diff --git a/config/config.exs b/config/config.exs
index ebaf1aec5..b19b36b22 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -353,7 +353,6 @@
   initial_timeout: 30,
   max_retries: 5
 
-<<<<<<< HEAD
 config :pleroma_job_queue, :queues,
   federator_incoming: 50,
   federator_outgoing: 50,