resolve spec conflict

spec/javascripts/notes/components/issue_comment_form_spec.js

@@ -2,11 +2,7 @@ import Vue from 'vue';
 import Autosize from 'autosize';
 import store from '~/notes/stores';
 import issueCommentForm from '~/notes/components/issue_comment_form.vue';
-<<<<<<< HEAD
-import { loggedOutIssueData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data';
-=======
 import { loggedOutnoteableData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data';
->>>>>>> upstream/master
 import { keyboardDownEvent } from '../../issue_show/helpers';
 
 describe('issue_comment_form component', () => {
@@ -194,11 +190,7 @@ describe('issue_comment_form component', () => {
   describe('user is not logged in', () => {
     beforeEach(() => {
       store.dispatch('setUserData', null);
-<<<<<<< HEAD
-      store.dispatch('setNoteableData', loggedOutIssueData);
-=======
       store.dispatch('setNoteableData', loggedOutnoteableData);
->>>>>>> upstream/master
       store.dispatch('setNotesData', notesDataMock);
 
       vm = mountComponent();