diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 33e5615..16e07fc 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -1404,7 +1404,6 @@ enum MessageType{
 	ArchitectureUnlockIndication = 3050112;
 	
 
-<<<<<<< HEAD
 	//探索地图
 	ExplorerMapInfoRequest = 3050040;
 	ExplorerMapInfoResponse = 3050041;
@@ -1416,8 +1415,7 @@ enum MessageType{
 	ExplorerMapRewardResponse = 3050047;
 	ExplorerMapIndicationResponse = 3050048;
 	
-=======
->>>>>>> 开发/dev_dh
+
 	//森罗幻境自动挂机奖励展示
     TowerGetRewardInfoShowRequest = 3050050;
 	TowerGetRewardInfoShowResponse = 3050051;