Fix merge conflicts

pom.xml

@@ -1232,14 +1232,14 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>4.0.0-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version>4.0.0</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon Device Management Plugins -->
         <carbon.devicemgt.plugins.version>5.0.0-SNAPSHOT</carbon.devicemgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
-        <android.agent.version>3.7.2</android.agent.version>
+        <android.agent.version>4.0.0</android.agent.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.6.21</carbon.commons.version>