Resolve conflicts in app/models/milestone.rb

app/models/milestone.rb

@@ -27,10 +27,7 @@ class Milestone < ActiveRecord::Base
   has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.milestones&.maximum(:iid) }
   has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.milestones&.maximum(:iid) }
 
-<<<<<<< HEAD
   has_many :boards
-=======
->>>>>>> upstream/master
   has_many :issues
   has_many :labels, -> { distinct.reorder('labels.title') },  through: :issues
   has_many :merge_requests