Resolved Issue, MergeRequest, Namespace conflicts

app/models/issue.rb

@@ -17,14 +17,11 @@ class Issue < ActiveRecord::Base
   include IgnorableColumn
 
   ignore_column :assignee_id, :branch_name, :deleted_at
-<<<<<<< HEAD
 
   WEIGHT_RANGE = 1..9
   WEIGHT_ALL = 'Everything'.freeze
   WEIGHT_ANY = 'Any Weight'.freeze
   WEIGHT_NONE = 'No Weight'.freeze
-=======
->>>>>>> upstream/master
 
   DueDateStruct = Struct.new(:title, :name).freeze
   NoDueDate     = DueDateStruct.new('No Due Date', '0').freeze

app/models/merge_request.rb

@@ -14,12 +14,9 @@ class MergeRequest < ActiveRecord::Base
   ignore_column :locked_at,
                 :ref_fetched,
                 :deleted_at
-<<<<<<< HEAD
 
   include ::EE::MergeRequest
   include Elastic::MergeRequestsSearch
-=======
->>>>>>> upstream/master
 
   belongs_to :target_project, class_name: "Project"
   belongs_to :source_project, class_name: "Project"

app/models/namespace.rb

 class Namespace < ActiveRecord::Base
-<<<<<<< HEAD
   prepend EE::Namespace
-=======
->>>>>>> upstream/master
   include CacheMarkdownField
   include Sortable
   include Gitlab::ShellAdapter
@@ -234,13 +231,10 @@ class Namespace < ActiveRecord::Base
     has_parent?
   end
 
-<<<<<<< HEAD
   def multiple_issue_boards_available?(user = nil)
     feature_available?(:multiple_issue_boards)
   end
 
-=======
->>>>>>> upstream/master
   private
 
   def refresh_access_of_projects_invited_groups