diff --git a/build/docker/config/dendrite.yaml b/build/docker/config/dendrite.yaml
index 6c5cdd8ce..c01ab62e7 100644
--- a/build/docker/config/dendrite.yaml
+++ b/build/docker/config/dendrite.yaml
@@ -312,20 +312,6 @@ user_api:
     max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
-<<<<<<< HEAD
-
-# Configuration for the Push Server API.
-push_server:
-  internal_api:
-    listen: http://localhost:7782
-    connect: http://localhost:7782
-  database:
-    connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_pushserver?sslmode=disable
-    max_open_conns: 10
-    max_idle_conns: 2
-    conn_max_lifetime: -1
-=======
->>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
 
 # Configuration for the Push Server API.
 push_server:
diff --git a/setup/config/config_test.go b/setup/config/config_test.go
index bed3bfe06..e6f0a493e 100644
--- a/setup/config/config_test.go
+++ b/setup/config/config_test.go
@@ -200,14 +200,6 @@ user_api:
     max_open_conns: 100
     max_idle_conns: 2
     conn_max_lifetime: -1
-<<<<<<< HEAD
-  pusher_database:
-    connection_string: file:pushserver.db
-    max_open_conns: 100
-    max_idle_conns: 2
-    conn_max_lifetime: -1
-=======
->>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
   pusher_database:
     connection_string: file:pushserver.db
     max_open_conns: 100