diff --git a/lib/chat/ChatPage.dart b/lib/chat/ChatPage.dart
index 51f3012..8c3bd22 100644
--- a/lib/chat/ChatPage.dart
+++ b/lib/chat/ChatPage.dart
@@ -133,15 +133,12 @@ class _ChatPageState extends State<ChatPage> {
     getDefaultSetting();
     getUserInfo();
 
-<<<<<<< HEAD
     controller = AutoScrollController(
         viewportBoundaryGetter: () =>
             Rect.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.bottom),
         axis: Axis.vertical);
-=======
     isTranslateButler = widget.isTranslateButler;
     ///todo 这里再判断是否还在服务时间
->>>>>>> 81c28f9c954a27b2453da76e51b7ec7c3f76017c
 
     startTime = DateTime.now().millisecondsSinceEpoch ~/ 1000;
 
@@ -716,15 +713,10 @@ class _ChatPageState extends State<ChatPage> {
     _keyboardIndexProvider.changeReadOnlyKey(true);
   }
 
-<<<<<<< HEAD
   sendMsg(MsgModel msg) async {
 //    if(widget.isTranslateButler){ ///翻译管家聊天通道
 //      msg.channelType = ChatChannelType.TransHK.value;
 //    }
-=======
-  sendMsg(MsgModel msg) {
-
->>>>>>> 81c28f9c954a27b2453da76e51b7ec7c3f76017c
 
     print('对方是否拉黑你 ${friendInfo.isBlackened}');
     if (BlacklistMgr.isBlack(friendInfo.userId)) {