fix conflict

ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue

 <script>
   import issuableApp from '~/issue_show/components/app.vue';
-<<<<<<< HEAD
   import relatedIssuesRoot from '~/issuable/related_issues/components/related_issues_root.vue';
-=======
   import issuableAppEventHub from '~/issue_show/event_hub';
->>>>>>> master
   import epicHeader from './epic_header.vue';
   import epicSidebar from '../../sidebar/components/sidebar_app.vue';