Resolve conflicts in entities and interpret_service_spec

lib/api/v3/entities.rb

@@ -294,10 +294,7 @@ module API
         expose :upvotes, :downvotes
         expose :due_date
         expose :confidential
-<<<<<<< HEAD
         expose :weight, if: ->(issue, _) { issue.supports_weight? }
-=======
->>>>>>> upstream/master
 
         expose :web_url do |issue, options|
           Gitlab::UrlBuilder.build(issue)

spec/services/quick_actions/interpret_service_spec.rb

@@ -695,7 +695,6 @@ describe QuickActions::InterpretService, services: true do
       let(:issuable) { issue }
     end
 
-<<<<<<< HEAD
     context 'issuable weights licensed' do
       before do
         stub_licensed_features(issue_weights: true)
@@ -730,8 +729,6 @@ describe QuickActions::InterpretService, services: true do
       end
     end
 
-=======
->>>>>>> upstream/master
     context '/duplicate command' do
       it_behaves_like 'duplicate command' do
         let(:issue_duplicate) { create(:issue, project: project) }