diff --git a/dji_sdk_lib/include/dji_sdk_lib/DJI_API.h b/dji_sdk_lib/include/dji_sdk_lib/DJI_API.h
index 965dba94..e2b13eb9 100644
--- a/dji_sdk_lib/include/dji_sdk_lib/DJI_API.h
+++ b/dji_sdk_lib/include/dji_sdk_lib/DJI_API.h
@@ -551,16 +551,12 @@ class CoreAPI
   void setVersion(const Version &value);
 
   /**
-<<<<<<< HEAD
-   * Setters and getters for Mobile CMD variables
-   */
-=======
+
    * Setters and getters for Mobile CMD variables - these are used 
    * when interacting with a Data Transparent Transmission App 
    */
 
   /** Core functions - getters */
->>>>>>> master
   bool getObtainControlMobileCMD() {return obtainControlMobileCMD;}
   bool getReleaseControlMobileCMD() {return releaseControlMobileCMD;}
   bool getActivateMobileCMD() {return activateMobileCMD;}
diff --git a/dji_sdk_lib/include/dji_sdk_lib/DJI_Type.h b/dji_sdk_lib/include/dji_sdk_lib/DJI_Type.h
index 40a91a05..3366e076 100644
--- a/dji_sdk_lib/include/dji_sdk_lib/DJI_Type.h
+++ b/dji_sdk_lib/include/dji_sdk_lib/DJI_Type.h
@@ -317,11 +317,7 @@ typedef struct WayPointData
  */
 
 typedef uint8_t MissionACK;
-<<<<<<< HEAD
-typedef uint32_t SimpleACK;
-=======
 typedef uint16_t SimpleACK;
->>>>>>> master
 
 typedef struct HotPointStartACK
 {
diff --git a/dji_sdk_lib/src/DJI_API.cpp b/dji_sdk_lib/src/DJI_API.cpp
index 2e1ef573..3ffed111 100644
--- a/dji_sdk_lib/src/DJI_API.cpp
+++ b/dji_sdk_lib/src/DJI_API.cpp
@@ -244,28 +244,6 @@ unsigned short CoreAPI::activate(ActivateData *data, int timeout)
   return ack_data;
 }
 
-unsigned short CoreAPI::activate(ActivateData *data, int timeout)
-{
-  data->version = versionData.version;
-  accountData = *data;
-  accountData.reserved = 2;
-
-  for (int i = 0; i < 32; ++i) accountData.iosID[i] = '0'; //! @note for ios verification
-  API_LOG(serialDevice, DEBUG_LOG, "version 0x%X/n", versionData.version);
-  API_LOG(serialDevice, DEBUG_LOG, "%.32s", accountData.iosID);
-  send(2, 0, SET_ACTIVATION, CODE_ACTIVATE, (unsigned char *)&accountData,
-    sizeof(accountData) - sizeof(char *), 1000, 3, 0, 0);
-
-  // Wait for end of ACK frame to arrive
-  serialDevice->lockACK();
-  serialDevice->wait(timeout);
-  serialDevice->freeACK();
-  ack_data = missionACKUnion.simpleACK;
-  if(ack_data == ACK_ACTIVE_SUCCESS && accountData.encKey)
-    setKey(accountData.encKey);
-
-  return ack_data;
-}
 
 void CoreAPI::sendToMobile(uint8_t *data, uint8_t len, CallBack callback, UserData userData)
 {
@@ -389,20 +367,6 @@ void CoreAPI::setBroadcastFreqToZero()
   * 11 - Control Information
   */
 
-<<<<<<< HEAD
-  freq[0] = BROADCAST_FREQ_1HZ;
-  freq[1] = BROADCAST_FREQ_10HZ;
-  freq[2] = BROADCAST_FREQ_50HZ;
-  freq[3] = BROADCAST_FREQ_100HZ;
-  freq[4] = BROADCAST_FREQ_50HZ;
-  freq[5] = BROADCAST_FREQ_10HZ;
-  freq[6] = BROADCAST_FREQ_1HZ;
-  freq[7] = BROADCAST_FREQ_10HZ;
-  freq[8] = BROADCAST_FREQ_50HZ;
-  freq[9] = BROADCAST_FREQ_100HZ;
-  freq[10] = BROADCAST_FREQ_50HZ;
-  freq[11] = BROADCAST_FREQ_10HZ;
-=======
   freq[0] = BROADCAST_FREQ_0HZ;
   freq[1] = BROADCAST_FREQ_0HZ;
   freq[2] = BROADCAST_FREQ_0HZ;
@@ -415,7 +379,6 @@ void CoreAPI::setBroadcastFreqToZero()
   freq[9] = BROADCAST_FREQ_0HZ;
   freq[10] = BROADCAST_FREQ_0HZ;
   freq[11] = BROADCAST_FREQ_0HZ;
->>>>>>> master
 
   setBroadcastFreq(freq);
 }
@@ -603,142 +566,6 @@ void CoreAPI::sendToMobileCallback(CoreAPI *api, Header *protocolHeader, UserDat
         protocolHeader->sessionID, protocolHeader->sequenceNumber);
   }
 }
-void CoreAPI::parseFromMobileCallback(CoreAPI *api, Header *protocolHeader, UserData userData __UNUSED)
-{
-  uint16_t mobile_data_id;
-  
-  if (protocolHeader->length - EXC_DATA_SIZE <= 4)
-  {
-    mobile_data_id = *((unsigned char*)protocolHeader + sizeof(Header) + 2);
-
-    switch (mobile_data_id)
-    {
-      case 2: 
-        if (obtainControlMobileCallback.callback)
-        {
-          obtainControlMobileCallback.callback(api, protocolHeader, obtainControlMobileCallback.userData);          
-        }
-        else
-        {
-          obtainControlMobileCMD = true; 
-        }
-        break;
-
-      case 3: 
-        if (releaseControlMobileCallback.callback)
-        {
-          releaseControlMobileCallback.callback(api, protocolHeader, releaseControlMobileCallback.userData);          
-        }
-        else
-        {
-          releaseControlMobileCMD = true;
-        }
-        break;
-
-      case 4: 
-        if (activateMobileCallback.callback)
-        {
-          activateMobileCallback.callback(api, protocolHeader, activateMobileCallback.userData);          
-        }
-        else
-        {
-          activateMobileCMD = true;
-        }
-        break;
-
-      case 5: 
-        if (armMobileCallback.callback)
-        {
-          armMobileCallback.callback(api, protocolHeader, armMobileCallback.userData);
-        }
-        else
-        {
-          armMobileCMD = true;
-        }
-        break;
-
-      case 6: 
-        if (disArmMobileCallback.callback)
-        {
-          disArmMobileCallback.callback(api, protocolHeader, disArmMobileCallback.userData);     
-        }
-        else
-        {
-          disArmMobileCMD = true;
-        }
-        break;
-
-      case 7: 
-        if (takeOffMobileCallback.callback)
-        {
-          takeOffMobileCallback.callback(api, protocolHeader, takeOffMobileCallback.userData);   
-        }
-        else
-        {
-          takeOffMobileCMD = true;
-        }
-        break;
-
-      case 8: 
-        if (landingMobileCallback.callback)
-        {
-          landingMobileCallback.callback(api, protocolHeader, landingMobileCallback.userData);  
-        }
-        else
-        {
-          landingMobileCMD = true;
-        }
-        break;
-
-      case 9: 
-        if (goHomeMobileCallback.callback)
-        {
-          goHomeMobileCallback.callback(api, protocolHeader, goHomeMobileCallback.userData); 
-        }
-        else
-        {
-          goHomeMobileCMD = true;
-        }
-        break;
-
-      case 10: 
-        if (takePhotoMobileCallback.callback)
-        {
-          takePhotoMobileCallback.callback(api, protocolHeader, takePhotoMobileCallback.userData);     
-        }
-        else
-        {
-          takePhotoMobileCMD = true;
-        }
-        break;
-
-      case 11: 
-        if (startVideoMobileCallback.callback)
-        {
-          startVideoMobileCallback.callback(api, protocolHeader, startVideoMobileCallback.userData);   
-        }
-        else
-        {
-          startVideoMobileCMD = true;
-        }
-        break;
-
-      case 13: 
-        if (stopVideoMobileCallback.callback)
-        {
-          stopVideoMobileCallback.callback(api, protocolHeader, stopVideoMobileCallback.userData); 
-        }
-        else
-        {
-          stopVideoMobileCMD = true;
-        }
-        break;
-      case 68:
-        followMeMobileCMD = true;
-  }
-  
-}
-}
 
 //! Mobile Data Transparent Transmission Input Servicing 
 void CoreAPI::parseFromMobileCallback(CoreAPI *api, Header *protocolHeader, UserData userData __UNUSED)