Resolve conflicts

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js

 import PipelineStage from '../../pipelines/components/stage.vue';
 import ciIcon from '../../vue_shared/components/ci_icon.vue';
-<<<<<<< HEAD
+import icon from '../../vue_shared/components/icon.vue';
 import { statusIconEntityMap } from '../../vue_shared/ci_status_icons';
 import linkedPipelinesMiniList from '../../vue_shared/components/linked_pipelines_mini_list.vue';
-=======
-import icon from '../../vue_shared/components/icon.vue';
->>>>>>> upstream/master
 
 export default {
   name: 'MRWidgetPipeline',
@@ -15,11 +12,8 @@ export default {
   components: {
     'pipeline-stage': PipelineStage,
     ciIcon,
-<<<<<<< HEAD
-    linkedPipelinesMiniList,
-=======
     icon,
->>>>>>> upstream/master
+    linkedPipelinesMiniList,
   },
   computed: {
     hasPipeline() {

app/assets/stylesheets/framework/common.scss

@@ -4,12 +4,6 @@
 .cred { color: $common-red; }
 .cgreen { color: $common-green; }
 .cdark { color: $common-gray-dark; }
-<<<<<<< HEAD
-.text-secondary {
-  color: $gl-text-color-secondary;
-}
-=======
->>>>>>> upstream/master
 
 .underlined-link { text-decoration: underline; }
 .hint { font-style: italic; color: $hint-color; }

app/models/epic.rb

 # Placeholder class for model that is implemented in EE
 # It will reserve (ee#3853) '&' as a reference prefix, but the table does not exists in CE
 class Epic < ActiveRecord::Base
-<<<<<<< HEAD
   prepend EE::Epic
 
-=======
->>>>>>> upstream/master
   # TODO: this will be implemented as part of #3853
   def to_reference
   end

app/models/issue.rb

@@ -15,14 +15,11 @@ class Issue < ActiveRecord::Base
   include RelativePositioning
   include CreatedAtFilterable
   include TimeTrackable
-<<<<<<< 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/services/issuable_base_service.rb

 class IssuableBaseService < BaseService
-<<<<<<< HEAD
   prepend ::EE::IssuableBaseService
 
-=======
->>>>>>> upstream/master
   private
 
   def filter_params(issuable)

app/services/merge_requests/update_service.rb

@@ -49,10 +49,8 @@ module MergeRequests
         create_branch_change_note(merge_request, 'target',
                                   merge_request.previous_changes['target_branch'].first,
                                   merge_request.target_branch)
-<<<<<<< HEAD
+
         reset_approvals(merge_request)
-=======
->>>>>>> upstream/master
       end
 
       if merge_request.previous_changes.include?('assignee_id')

lib/api/api_guard.rb

@@ -44,18 +44,14 @@ module API
 
     # Helper Methods for Grape Endpoint
     module HelperMethods
-<<<<<<< HEAD
-      def find_current_user
+      def find_current_user!
         user =
-          find_user_from_private_token ||
+          find_user_from_access_token ||
           find_user_from_oauth_token ||
           find_user_from_warden ||
           find_user_by_job_token
-=======
-      def find_current_user!
-        user = find_user_from_access_token || find_user_from_warden
+
         return unless user
->>>>>>> upstream/master
 
         forbidden!('User is blocked') unless Gitlab::UserAccess.new(user).allowed? && user.can?(:access_api)
 

spec/helpers/issuables_helper_spec.rb

@@ -190,7 +190,6 @@ describe IssuablesHelper do
       }
       expect(JSON.parse(helper.issuable_initial_data(issue))).to eq(expected_data)
     end
-<<<<<<< HEAD
 
     it 'returns the correct json for an epic' do
       epic = create(:epic, author: user, description: 'epic text')
@@ -213,7 +212,5 @@ describe IssuablesHelper do
       }
       expect(JSON.parse(helper.issuable_initial_data(epic))).to eq(expected_data)
     end
-=======
->>>>>>> upstream/master
   end
 end

spec/requests/api/helpers_spec.rb

@@ -31,7 +31,6 @@ describe API::Helpers do
       .and_return(route_authentication_setting)
   end
 
-<<<<<<< HEAD
   def set_env(user_or_token, identifier)
     clear_env
     clear_param
@@ -58,8 +57,6 @@ describe API::Helpers do
     params.delete(API::Helpers::SUDO_PARAM)
   end
 
-=======
->>>>>>> upstream/master
   def warden_authenticate_returns(value)
     warden = double("warden", authenticate: value)
     env['warden'] = warden
@@ -209,7 +206,6 @@ describe API::Helpers do
         expect { current_user }.to raise_error API::APIGuard::ExpiredError
       end
     end
-<<<<<<< HEAD
 
     describe "when authenticating using a job token" do
       let(:job) { create(:ci_build, user: current_user) }
@@ -443,8 +439,6 @@ describe API::Helpers do
         end
       end
     end
-=======
->>>>>>> upstream/master
   end
 
   describe '.handle_api_exception' do