diff --git a/pom.xml b/pom.xml
index 9f92727775..1127a873b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1865,7 +1865,7 @@
     <properties>
         <servelet.jsp.version>2.2.1</servelet.jsp.version>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.4.10</carbon.kernel.version>
+        <carbon.kernel.version>4.4.11</carbon.kernel.version>
         <carbon.kernel.449.version>4.4.9</carbon.kernel.449.version>
         <carbon.kernel.version.range>[4.4.0, 5.0.0)</carbon.kernel.version.range>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1909,17 +1909,12 @@
         <carbon.deployment.version>4.7.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-<!--<<<<<<< HEAD-->
-        <!--<carbon.identity.framework.version>5.2.2</carbon.identity.framework.version>-->
-        <!--<identity.inbound.auth.oauth.version>5.1.1</identity.inbound.auth.oauth.version>-->
-        <!--<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>-->
-<!--=======-->
-        <carbon.identity.framework.version>5.6.89</carbon.identity.framework.version>
-        <identity.inbound.auth.oauth.version>5.2.33</identity.inbound.auth.oauth.version>
-        <identity.inbound.auth.saml.version>5.2.14</identity.inbound.auth.saml.version>
+        <carbon.identity.framework.version>5.7.0</carbon.identity.framework.version>
+        <identity.inbound.auth.oauth.version>5.3.2-SNAPSHOT</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.saml.version>5.3.0</identity.inbound.auth.saml.version>
 
         <!-- Carbon Identity import version ranges -->
-        <carbon.identity.imp.pkg.version>[5.6.0, 6.0.0)</carbon.identity.imp.pkg.version>
+        <carbon.identity.imp.pkg.version>[5.7.0, 6.0.0)</carbon.identity.imp.pkg.version>
         <carbon.identity-inbound-auth-oauth.imp.pkg.version>[5.2.0, 6.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>
         <carbon.identity-user-ws.imp.pkg.version>[5.1.0, 6.0.0)</carbon.identity-user-ws.imp.pkg.version>
 
@@ -1945,11 +1940,7 @@
 	    <commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>
 
         <!-- Carbon API Management -->
-<!--<<<<<<< HEAD-->
-        <!--<carbon.api.mgt.version>6.0.6-SNAPSHOT</carbon.api.mgt.version>-->
-        <!--<carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range>-->
-<!--=======-->
-        <carbon.api.mgt.version>6.1.2</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.20-SNAPSHOT</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Analytics Commons -->