diff --git a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
index 9220498435ec3513e6f0eea930c7373c34d01b8a..2aeb413ed581870c6ef1943e7425fc1e1df9bf61 100644
--- a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
+++ b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
@@ -12,11 +12,7 @@ services:
       - "tmss"
     environment:
       - OIDC_ENDPOINT_HOST=172.25.0.10
-<<<<<<< HEAD
       - OIDC_RP_CLIENT_ID=1
-=======
-      - OIDC_RP_CLIENT_ID=2
->>>>>>> TMSS-138: fixed docker compose setup for OIDC with static IP on bridge network
   tmss_test_nginx:
     build:
       context: .