Resolve conflicts

app/assets/javascripts/notes/components/comment_form.vue

@@ -7,15 +7,11 @@ import { __, sprintf } from '~/locale';
 import Flash from '../../flash';
 import Autosave from '../../autosave';
 import TaskList from '../../task_list';
-<<<<<<< HEAD
 import {
   capitalizeFirstCharacter,
   convertToCamelCase,
   splitCamelCase,
 } from '../../lib/utils/text_utility';
-=======
-import { capitalizeFirstCharacter, convertToCamelCase, splitCamelCase } from '../../lib/utils/text_utility';
->>>>>>> upstream/master
 import * as constants from '../constants';
 import eventHub from '../event_hub';
 import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
@@ -125,13 +121,9 @@ export default {
       return this.getNoteableData.create_note_path;
     },
     issuableTypeTitle() {
-<<<<<<< HEAD
       return this.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE
         ? 'merge request'
         : 'issue';
-=======
-      return this.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE ? 'merge request' : 'issue';
->>>>>>> upstream/master
     },
   },
   watch: {

app/models/concerns/issuable.rb

@@ -112,13 +112,6 @@ module Issuable
 
     def etag_caching_enabled?
       false
-<<<<<<< HEAD
-=======
-    end
-
-    def has_multiple_assignees?
-      assignees.count > 1
->>>>>>> upstream/master
     end
   end
 

app/models/merge_request.rb

@@ -1130,15 +1130,12 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-<<<<<<< HEAD
   def base_pipeline
     @base_pipeline ||= project.pipelines
       .order(id: :desc)
       .find_by(sha: diff_base_sha)
   end
 
-=======
->>>>>>> upstream/master
   def discussions_rendered_on_frontend?
     true
   end