Fixed issue_builder and merge_request_builder related conflicts.

lib/gitlab/hook_data/issue_builder.rb

 module Gitlab
   module HookData
     class IssueBuilder < BaseBuilder
-<<<<<<< HEAD
       prepend ::EE::Gitlab::HookData::IssueBuilder
 
-=======
->>>>>>> upstream/master
       SAFE_HOOK_RELATIONS = %i[
         assignees
         labels
@@ -51,11 +48,7 @@ module Gitlab
         }
 
         issue.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes)
-<<<<<<< HEAD
           .merge!(attrs)
-=======
-            .merge!(attrs)
->>>>>>> upstream/master
       end
     end
   end

lib/gitlab/hook_data/merge_request_builder.rb

@@ -53,11 +53,7 @@ module Gitlab
         }
 
         merge_request.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes)
-<<<<<<< HEAD
           .merge!(attrs)
-=======
-            .merge!(attrs)
->>>>>>> upstream/master
       end
     end
   end