diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml
index 305cda6..1ed65b5 100644
--- a/linkwarden/compose.yaml
+++ b/linkwarden/compose.yaml
@@ -17,14 +17,11 @@ services:
       - DATABASE_URL=postgresql://linkwarden:${POSTGRES_PASSWORD}@linkwarden_db:5432/linkwarden
       - MEILI_HOST=linkwarden_search
       - NEXTAUTH_URL=https://linkwarden.ferngarden.net/api/v1/auth
-<<<<<<< HEAD
       - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
-=======
       - NEXT_PUBLIC_AUTHENTIK_ENABLED=true
       - AUTHENTIK_ISSUER=https://auth.fern.garden/application/o/linkwarden
       - AUTHENTIK_CLIENT_ID=${AUTHENTIK_CLIENT_ID}
       - AUTHENTIK_CLIENT_SECRET=${AUTHENTIK_CLIENT_SECRET}
->>>>>>> 6e7a2d8 (Add authentik login for linkwarden)
     restart: always
     volumes:
       - /mnt/docker/linkwarden/data:/data/data