diff --git a/.env-sample b/.env-sample
index 47c622a..b01b6f9 100644
--- a/.env-sample
+++ b/.env-sample
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # .env
 
 NODE_ENV=development
@@ -15,3 +16,22 @@ KEYCLOAK_VALIDATION_MODE=offline
 
 KEYCLOAK_TOKEN_BUFFER_SECONDS=30
 
+=======
+# .env
+
+NODE_ENV=development
+PORT=3000
+
+KEYCLOAK_SERVER_URL=https://keycloak-dcb.app.cameleonapp.com
+KEYCLOAK_REALM=dcb-dev
+KEYCLOAK_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwfT6BGerQyJ7EOFcgN1DLxRh/8g3cCN5qNZyeLQc6524Lsw3voMD2HJddvAunCcn6Eux2LTYXPzLvZc8829Sa5ksTzINyPqg9GFZa5+GAifMW6DfvQcxGyl5yvduCWxOSmST3PYN9UkCFP20e3gDLRox9rNe1/17xkDJwByJh/Xld/m07vHgyglDNRGkA/YW3A1JuAKgJjAstLOyeK+UGdMeJmD/5TF/yoBI/FsjW/OjZ78wP3dfkGo5zG2EOkK+39evU7HxB4jgL5SBhw32GLPVhtyCMnUW6IlsQhDSDWXqBdMCO0/hdrjyznyM7ZJqkUN7KAFKqcJsnja9mBNT4QIDAQAB
+
+KEYCLOAK_ADMIN_CLIENT_ID=dcb-user-service-cc
+KEYCLOAK_ADMIN_CLIENT_SECRET=VS7fDASmxmPOjn0JkhbtNDh7ULm0QGGa
+KEYCLOAK_AUTH_CLIENT_ID=dcb-user-service-pwd
+KEYCLOAK_AUTH_CLIENT_SECRET=J0VvIiiJST40SD3apiQ206r1xNCERFD2
+KEYCLOAK_VALIDATION_MODE=offline
+
+KEYCLOAK_TOKEN_BUFFER_SECONDS=30
+
+>>>>>>> 0a924ba2f320e739c5a149004e9ef64499628d51