diff --git a/apps/docs/content/docs/3.1-beta/quick-start.mdx b/apps/docs/content/docs/3.1-beta/quick-start.mdx
index 611e56e..8cd92fe 100644
--- a/apps/docs/content/docs/3.1-beta/quick-start.mdx
+++ b/apps/docs/content/docs/3.1-beta/quick-start.mdx
@@ -103,13 +103,8 @@ services:
       - ENABLE_S3=false
       - ENCRYPTION_KEY=change-this-key-in-production-min-32-chars # CHANGE THIS KEY FOR SECURITY
       # - SECURE_SITE=false # Set to true if you are using a reverse proxy
-<<<<<<< HEAD:apps/docs/content/docs/3.0-beta/quick-start.mdx
-      - PALMR_UID=1000 # Set to your user ID (run 'id' to find it)
-      - PALMR_GID=1000 # Set to your group ID (run 'id' to find it)
-=======
       - PALMR_UID=1000 # UID for the container processes (default is 1001)
       - PALMR_GID=1000 # GID for the container processes (default is 1001)
->>>>>>> feat/multi-oidc-providers:apps/docs/content/docs/3.1-beta/quick-start.mdx
     ports:
       - "5487:5487" # Web port
       - "3333:3333" # API port (OPTIONAL EXPOSED - ONLY IF YOU WANT TO ACCESS THE API DIRECTLY)