Resolve merge conflicts

ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue

@@ -136,11 +136,7 @@ export default {
   <history-comment-editor
     v-if="isEditingComment"
     class="discussion-reply-holder"
-<<<<<<< HEAD
     :initial-comment="initialComment"
-=======
-    :initial-comment="commentNote"
->>>>>>> origin/master
     :is-saving="isSavingComment"
     @onSave="saveComment"
     @onCancel="cancelEditingComment"

ee/app/assets/javascripts/vulnerabilities/components/history_comment_editor.vue

 <script>
-<<<<<<< HEAD
 import { sanitize } from 'dompurify';
-import { GlFormTextarea, GlButton, GlLoadingIcon } from '@gitlab/ui';
-=======
 import { GlFormTextarea, GlButton } from '@gitlab/ui';
->>>>>>> origin/master
 
 export default {
   components: { GlFormTextarea, GlButton },
@@ -48,12 +44,7 @@ export default {
         ref="saveButton"
         variant="success"
         :disabled="isSaveButtonDisabled"
-<<<<<<< HEAD
         @click="$emit('onSave', sanitizedComment)"
-=======
-        :loading="isSaving"
-        @click="$emit('onSave', trimmedComment)"
->>>>>>> origin/master
       >
         {{ __('Save comment') }}
       </gl-button>