Fix conflict

app/mailers/emails/merge_requests.rb

@@ -64,7 +64,6 @@ module Emails
       mail_answer_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id, reason))
     end
 
-<<<<<<< HEAD
     def add_merge_request_approver_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil)
       setup_merge_request_mail(merge_request_id, recipient_id)
 
@@ -86,8 +85,6 @@ module Emails
       mail_answer_thread(@merge_request, merge_request_thread_options(unapproved_by_user_id, recipient_id, reason))
     end
 
-=======
->>>>>>> upstream/master
     def resolved_all_discussions_email(recipient_id, merge_request_id, resolved_by_user_id, reason = nil)
       setup_merge_request_mail(merge_request_id, recipient_id)
 

app/services/notification_service.rb

@@ -525,7 +525,6 @@ class NotificationService
     end
   end
 
-<<<<<<< HEAD
   def approve_mr_email(merge_request, project, current_user)
     recipients = NotificationRecipientService.build_recipients(merge_request, current_user, action: 'approve')
 
@@ -550,8 +549,6 @@ class NotificationService
     end
   end
 
-=======
->>>>>>> upstream/master
   def mailer
     Notify
   end

app/services/todo_service.rb

@@ -104,7 +104,6 @@ class TodoService
     merge_request.merge_participants.each do |user|
       create_build_failed_todo(merge_request, user)
     end
-<<<<<<< HEAD
   end
 
   # When new approvers are added for a merge request:
@@ -113,8 +112,6 @@ class TodoService
   #
   def add_merge_request_approvers(merge_request, approvers)
     create_approval_required_todos(merge_request, approvers, merge_request.author)
-=======
->>>>>>> upstream/master
   end
 
   # When a new commit is pushed to a merge request we should: