Update refresh_service.rb

app/services/merge_requests/refresh_service.rb

@@ -2,19 +2,12 @@
 
 module MergeRequests
   class RefreshService < MergeRequests::BaseService
-<<<<<<< HEAD
     prepend EE::MergeRequests::RefreshService
 
     def execute(oldrev, newrev, ref)
       push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref)
       return true unless push.branch_push?
 
-=======
-    def execute(oldrev, newrev, ref)
-      push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref)
-      return true unless push.branch_push?
-
->>>>>>> upstream/master
       refresh_merge_requests!(push)
     end