Fix conflicts relating to models/project_services/chat_message/merge_message.rb

app/models/project_services/chat_message/merge_message.rb

@@ -48,11 +48,7 @@ module ChatMessage
     end
 
     def merge_request_message
-<<<<<<< HEAD
-      "#{user_name} #{state_or_action_text} #{merge_request_link} in #{project_link}: #{title}"
-=======
-      "#{user_combined_name} #{state} #{merge_request_link} in #{project_link}: #{title}"
->>>>>>> ce-com/master
+      "#{user_combined_name} #{state_or_action_text} #{merge_request_link} in #{project_link}: #{title}"
     end
 
     def merge_request_link

spec/models/project_services/chat_message/merge_message_spec.rb

@@ -57,7 +57,7 @@ describe ChatMessage::MergeMessage do
 
     it 'returns a message regarding approval of merge requests' do
       expect(subject.pretext).to eq(
-        'test.user approved <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> '\
+        'Test User (test.user) approved <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> '\
         'in <http://somewhere.com|project_name>: *Merge Request title*')
       expect(subject.attachments).to be_empty
     end