diff --git a/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h b/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
index fbccd9b64..4801c63e5 100755
--- a/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
+++ b/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
@@ -60,7 +60,11 @@ typedef struct PlcSocketParamStruct{
 }PlcSocketParamType;
 
 //debug command
+<<<<<<< HEAD
 #define plc_print KPrintf
+=======
+#define plc_print //KPrintf
+>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914
 #define plc_error KPrintf
 #define plc_notice KPrintf
 
diff --git a/Ubiquitous/XiZi/board/ok1052-c/board.c b/Ubiquitous/XiZi/board/ok1052-c/board.c
index 020ec347e..8bc57fdf5 100644
--- a/Ubiquitous/XiZi/board/ok1052-c/board.c
+++ b/Ubiquitous/XiZi/board/ok1052-c/board.c
@@ -71,7 +71,10 @@ int MountSDCard(void)
 #endif
 #ifdef BSP_USING_LPUART
 #include <connect_uart.h>
+<<<<<<< HEAD
 #endif
+=======
+>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914
 
 #ifdef BSP_USING_ADC
 #include <connect_adc.h>