diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml
index ad86a9f4..664bd894 100644
--- a/docs/docker/postgres/docker-compose.yml
+++ b/docs/docker/postgres/docker-compose.yml
@@ -29,8 +29,4 @@ services:
     depends_on:
         - db
     ports:
-<<<<<<< HEAD
-      - "127.0.0.1:13120:13120"
-=======
       - 127.0.0.1:13120:13120
->>>>>>> master