diff --git a/website/docs/concepts/oauth-dex-concept.md b/website/docs/concepts/oauth-dex-concept.md
index 0ac2cd33..74a58407 100644
--- a/website/docs/concepts/oauth-dex-concept.md
+++ b/website/docs/concepts/oauth-dex-concept.md
@@ -23,9 +23,17 @@ Litmus portal uses two components for authentication of users:
 - Authentication Server
 - Dex OIDC Server (Optional)
 
+<<<<<<< HEAD
+By default chaoscenter comes with then authentication server as part of the `litmusportal-server` deployment and it allows local authentication that is based of mongo database. Client services such as `litmus-ctl` and `litmusportal-frontend` make use of this server.
+=======
 By default litmus-portal comes with then authentication server as part of the **litmusportal-server** deployment and it allows local authentication that is based of mongo database. Client services such as **litmusctl** and **litmusportal-frontend** make use of this server.
+>>>>>>> ceb8a67f939a9cbf444a6a40a60b4a2b3050e727
 
-In order to provide enhanced and seamless login features, we wanted to integrate OAuth and other authentication mechanisms such as OpenID connect. To have flexibility, litmus-portal makes use of an additional component, [Dex OIDC server](https://dexidp.io/).
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0701239a71547d4177ceb6272a35f7b239617acf
+In order to provide enhanced and seamless login features, we wanted to integrate OAuth and other authentication mechanisms such as OpenID connect. To have flexibility, chaoscenter makes use of an additional component, [Dex OIDC server](https://dexidp.io/).
 
 Dex is a highly extensible cloud-native OIDC provider that is able to take care of various authentication mechanisms. With Dex being deployed, the authentication-server can communicate with the dex-server which enables the integration of various OAuth providers. GitHub and Google auth has been tested at present.
 
diff --git a/website/docs/user-guides/chaoscenter-oauth-dex-installation.md b/website/docs/user-guides/chaoscenter-oauth-dex-installation.md
index 88b8aea0..52a1f6e5 100644
--- a/website/docs/user-guides/chaoscenter-oauth-dex-installation.md
+++ b/website/docs/user-guides/chaoscenter-oauth-dex-installation.md
@@ -38,7 +38,7 @@ Make sure you have your Google and GitHub Client credentials ready, if you do no
 ### Configuring Dex OIDC provider
 
 ```bash
-curl https://raw.githubusercontent.com/litmuschaos/litmus/master/litmus-portal/dex-server/dex-deployment.yaml --output dex-deployment.yaml
+curl https://raw.githubusercontent.com/litmuschaos/litmus/master/chaoscenter/dex-server/dex-deployment.yaml --output dex-deployment.yaml
 ```
 
 1. Open the file with your favorite text-editor
@@ -138,8 +138,8 @@ Under `auth-server`, verify if the `DEX_ENABLED` variables are set
     Ports:       3000/TCP, 3030/TCP
     Host Ports:  0/TCP, 0/TCP
     Environment Variables from:
-      litmus-portal-admin-config  ConfigMap  Optional: false
-      litmus-portal-admin-secret  Secret     Optional: false
+      chaoscenter-admin-config  ConfigMap  Optional: false
+      chaoscenter-admin-secret  Secret     Optional: false
     Environment:
       STRICT_PASSWORD_POLICY:  false
       ADMIN_USERNAME:          admin
diff --git a/website/sidebars.js b/website/sidebars.js
index 6b5cdc39..150bc9d9 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -107,9 +107,12 @@ module.exports = {
       ]
     },
     {
+<<<<<<< HEAD
+=======
       'Developer Guide': ['developer-guide/chaoscenter-developer-guide'] 
      },
     {
+>>>>>>> ceb8a67f939a9cbf444a6a40a60b4a2b3050e727
       Litmusctl: ['litmusctl/installation', 'litmusctl/litmusctl-usage']
     },
     {
diff --git a/website/versioned_sidebars/version-3.10.0-sidebars.json b/website/versioned_sidebars/version-3.10.0-sidebars.json
index 9c12b115..021048b1 100644
--- a/website/versioned_sidebars/version-3.10.0-sidebars.json
+++ b/website/versioned_sidebars/version-3.10.0-sidebars.json
@@ -116,11 +116,14 @@
       ]
     },
     {
+<<<<<<< HEAD
+=======
       "Developer Guide": [
         "developer-guide/chaoscenter-developer-guide"
       ]
     },
     {
+>>>>>>> ceb8a67f939a9cbf444a6a40a60b4a2b3050e727
       "Litmusctl": [
         "litmusctl/installation",
         "litmusctl/litmusctl-usage"
diff --git a/website/versioned_sidebars/version-3.9.1-sidebars.json b/website/versioned_sidebars/version-3.9.1-sidebars.json
index 9c12b115..021048b1 100644
--- a/website/versioned_sidebars/version-3.9.1-sidebars.json
+++ b/website/versioned_sidebars/version-3.9.1-sidebars.json
@@ -116,11 +116,14 @@
       ]
     },
     {
+<<<<<<< HEAD
+=======
       "Developer Guide": [
         "developer-guide/chaoscenter-developer-guide"
       ]
     },
     {
+>>>>>>> ceb8a67f939a9cbf444a6a40a60b4a2b3050e727
       "Litmusctl": [
         "litmusctl/installation",
         "litmusctl/litmusctl-usage"
diff --git a/website/versioned_sidebars/version-3.9.2-sidebars.json b/website/versioned_sidebars/version-3.9.2-sidebars.json
index 768f249b..2ea3d4b5 100644
--- a/website/versioned_sidebars/version-3.9.2-sidebars.json
+++ b/website/versioned_sidebars/version-3.9.2-sidebars.json
@@ -114,10 +114,13 @@
         "user-guides/image-registry",
         "user-guides/uninstall-litmus"
       ]
+<<<<<<< HEAD
+=======
     },{
       "Developer Guide": [
         "developer-guide/chaoscenter-developer-guide"
       ]
+>>>>>>> ceb8a67f939a9cbf444a6a40a60b4a2b3050e727
     },
     {
       "Litmusctl": [