diff --git a/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c b/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c
index 6c8ebd4e8b3..5e103f5ab3f 100644
--- a/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c
+++ b/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c
@@ -450,11 +450,8 @@ static void datsSetup(dmEvt_t *pMsg)
 {
     /* Initialize control information */
     datsCb.restoringResList = FALSE;
-    < < < < < < < < <
-        Temporary merge branch 1 memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
-    datsScanDataDisc[0] = sizeof(deviceName);
-    datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME;
-    == == == == = memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
+    
+    memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
     datsScanDataDisc[0] = sizeof(deviceName);
     datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME;