diff --git a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/ap/ap_sync.c b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/ap/ap_sync.c
index ddb60a7ae73..50dac5a8c40 100644
--- a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/ap/ap_sync.c
+++ b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/ap/ap_sync.c
@@ -90,11 +90,7 @@ VOID APPeerProbeReqAction(
 #endif /* WDS_SUPPORT */
 
 	if (PeerProbeReqSanity(pAd, Elem->Msg, Elem->MsgLen, &ProbeReqParam) == FALSE) {
-<<<<<<< HEAD
-		MTWF_LOG(DBG_CAT_AP, DBG_SUBCAT_ALL, DBG_LVL_OFF, ("%s():shiang! PeerProbeReqSanity failed!\n", __func__));
-=======
 		MTWF_LOG(DBG_CAT_AP, DBG_SUBCAT_ALL, DBG_LVL_TRACE, ("%s():shiang! PeerProbeReqSanity failed!\n", __func__));
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 		return;
 	}
 
diff --git a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_profile.c b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_profile.c
index 914499b4cd1..093298f93d2 100644
--- a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_profile.c
+++ b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_profile.c
@@ -362,10 +362,7 @@ static VOID RTMPChannelCfg(RTMP_ADAPTER *pAd, RTMP_STRING *Buffer)
 #endif /* CONFIG_AP_SUPPORT */
 	}
 
-<<<<<<< HEAD
-=======
 #ifndef DBDC_MODE
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 #ifdef CONFIG_AP_SUPPORT
 #ifdef MBSS_SUPPORT
 	/*Can not assign default channel to wdev-> channel when channel = 0 */
@@ -386,10 +383,7 @@ static VOID RTMPChannelCfg(RTMP_ADAPTER *pAd, RTMP_STRING *Buffer)
 	}
 #endif/*MBSS_SUPPORT*/
 #endif /*CONFIG_AP_SUPPORT*/
-<<<<<<< HEAD
-=======
 #endif /*DBDC_MODE*/
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 
 }
 
@@ -3742,13 +3736,9 @@ NDIS_STATUS	RTMPSetProfileParameters(
 
 #ifdef CONFIG_AP_SUPPORT
 		/*AutoChannelSelect*/
-<<<<<<< HEAD
-		if (RTMPGetKeyParameter("AutoChannelSelect", tmpbuf, 10, pBuffer, TRUE)) {
-=======
 		pAd->ApCfg.AutoChannelAlg = 3; //force using busytime ACS alg
 		if (RTMPGetKeyParameter("AutoChannelSelect", tmpbuf, 10, pBuffer, TRUE)) {
 			
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 			if (os_str_tol(tmpbuf, 0, 10) != 0) { /*Enable*/
 				ChannelSel_Alg SelAlg = (ChannelSel_Alg)os_str_tol(tmpbuf, 0, 10);
 
@@ -3756,10 +3746,6 @@ NDIS_STATUS	RTMPSetProfileParameters(
 					pAd->ApCfg.bAutoChannelAtBootup = FALSE;
 				else { /*Enable*/
 					pAd->ApCfg.bAutoChannelAtBootup = TRUE;
-<<<<<<< HEAD
-					pAd->ApCfg.AutoChannelAlg = 3;
-=======
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 				}
 			} else /*Disable*/
 				pAd->ApCfg.bAutoChannelAtBootup = FALSE;
@@ -3774,15 +3760,7 @@ NDIS_STATUS	RTMPSetProfileParameters(
 
 		/*Channel*/
 		/*Note: AutoChannelSelect must be put before Channel in dat file*/
-<<<<<<< HEAD
-		if (RTMPGetKeyParameter("Channel", tmpbuf, 100, pBuffer, TRUE)
-#ifdef CONFIG_AP_SUPPORT
-			&& !pAd->ApCfg.bAutoChannelAtBootup
-#endif
-			) {
-=======
 		if (RTMPGetKeyParameter("Channel", tmpbuf, 100, pBuffer, TRUE)) {
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 			RTMPChannelCfg(pAd, tmpbuf);
 		}
 
@@ -4119,10 +4097,6 @@ NDIS_STATUS	RTMPSetProfileParameters(
 					pAd->CommonCfg.cPowerUpCckOfdm[BAND1][6]));
 			}
 #endif /* DBDC_MODE */
-<<<<<<< HEAD
-
-=======
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 		}
 
 		/* Power Boost (HT20) */
diff --git a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_sanity.c b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_sanity.c
index ccb0a943f9d..b99077df353 100644
--- a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_sanity.c
+++ b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/cmm_sanity.c
@@ -215,11 +215,7 @@ BOOLEAN PeerAddBARspActionSanity(
 	pAddFrame->TimeOutValue = cpu2le16(pAddFrame->TimeOutValue);
 
 	if (pAddFrame->BaParm.BAPolicy != IMMED_BA) {
-<<<<<<< HEAD
-		MTWF_LOG(DBG_CAT_MLME, DBG_SUBCAT_ALL, DBG_LVL_ERROR, ("%s(): ADDBA Resp Ba Policy[%d] not support\n", __func__, pAddFrame->BaParm.BAPolicy));
-=======
 		MTWF_LOG(DBG_CAT_MLME, DBG_SUBCAT_ALL, DBG_LVL_TRACE, ("%s(): ADDBA Resp Ba Policy[%d] not support\n", __func__, pAddFrame->BaParm.BAPolicy));
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 		return FALSE;
 	}
 
diff --git a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/multi_profile.c b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/multi_profile.c
index 946a0802f98..c6e0a893594 100644
--- a/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/multi_profile.c
+++ b/trunk/proprietary/rt_wifi/rtpci/5.0.4.0/mt7615/embedded/common/multi_profile.c
@@ -2161,8 +2161,6 @@ INT multi_profile_check(struct _RTMP_ADAPTER *ad, CHAR *final)
 	fname = multi_profile_fname_get(ad, MTB_2G_PROFILE);
 #endif
 
-<<<<<<< HEAD
-=======
 	/*
 	 * if DEFAULT_5G_PROFILE is enabled, buf1 is 5G profile, buf2 is 2G profile.
 	 * Otherwise, buf1 is 2G profile, buf2 is 5G profile
@@ -2175,7 +2173,6 @@ INT multi_profile_check(struct _RTMP_ADAPTER *ad, CHAR *final)
 
 	printk("%s: buf1: %s\n", __func__, fname);
 
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 	if (multi_profile_read(fname, buf1) != NDIS_STATUS_SUCCESS)
 		goto end1;
 
@@ -2191,11 +2188,8 @@ INT multi_profile_check(struct _RTMP_ADAPTER *ad, CHAR *final)
 	fname = multi_profile_fname_get(ad, MTB_5G_PROFILE);
 #endif
 
-<<<<<<< HEAD
-=======
 	printk("%s: buf2: %s\n", __func__, fname);
 
->>>>>>> a321e6940bb0cb44619e21b8b3df6e91f892751a
 	if (multi_profile_read(fname, buf2) != NDIS_STATUS_SUCCESS)
 		goto end2;