Resolve conflicts

app/assets/javascripts/boards/components/issue_card_inner.js

 import $ from 'jquery';
 import Vue from 'vue';
-<<<<<<< HEAD
 import IssueCardWeight from 'ee/boards/components/issue_card_weight.vue';
-=======
->>>>>>> upstream/master
 import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
 import eventHub from '../eventhub';
 
@@ -50,10 +47,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
   },
   components: {
     UserAvatarLink,
-<<<<<<< HEAD
     IssueCardWeight,
-=======
->>>>>>> upstream/master
   },
   computed: {
     numberOverLimit() {

config/webpack.config.js

@@ -39,7 +39,6 @@ function generateEntries() {
   }
 
   pageEntries.forEach(( path ) => generateAutoEntries(path));
-<<<<<<< HEAD
 
   // EE-specific auto entries
   const eePageEntries = glob.sync('pages/**/index.js', {
@@ -49,8 +48,6 @@ function generateEntries() {
   watchAutoEntries.concat(
     path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'),
   );
-=======
->>>>>>> upstream/master
 
   autoEntriesCount = Object.keys(autoEntries).length;
 
@@ -253,15 +250,12 @@ const config = {
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.esm.js',
       'spec':           path.join(ROOT_PATH, 'spec/javascripts'),
-<<<<<<< HEAD
 
       // EE-only
       ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
       ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
       ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
-=======
->>>>>>> upstream/master
     }
   },