diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj
index d384f87..72a4f1e 100644
--- a/QXLive.xcodeproj/project.pbxproj
+++ b/QXLive.xcodeproj/project.pbxproj
@@ -787,11 +787,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-<<<<<<< HEAD
-				MARKETING_VERSION = 1.1.4;
-=======
 				MARKETING_VERSION = 1.1.6;
->>>>>>> dev
 				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -857,11 +853,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-<<<<<<< HEAD
-				MARKETING_VERSION = 1.1.4;
-=======
 				MARKETING_VERSION = 1.1.6;
->>>>>>> dev
 				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/QXLive/Room(房间)/View/QXRoomChatListView.m b/QXLive/Room(房间)/View/QXRoomChatListView.m
index 207e897..62ee82a 100644
--- a/QXLive/Room(房间)/View/QXRoomChatListView.m
+++ b/QXLive/Room(房间)/View/QXRoomChatListView.m
@@ -207,11 +207,7 @@ NSInteger maxMessageCount = 20;
         if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) {
             text = model.text;
         }else{
-<<<<<<< HEAD
-            text = [NSString stringWithFormat:@"%@说，%@",model.FromUserInfo.nickname,model.text];
-=======
             text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text];
->>>>>>> dev
         }
         AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
         utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"];