Resolved CE -> EE conflicts for issue board card redesign

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

@@ -3,10 +3,7 @@ import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
 import { sprintf, __ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.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';
 import IssueDueDate from './issue_due_date.vue';
@@ -19,10 +16,7 @@ export default {
     UserAvatarLink,
     TooltipOnTruncate,
     IssueDueDate,
-<<<<<<< HEAD
     IssueCardWeight,
-=======
->>>>>>> upstream/master
     IssueTimeEstimate,
   },
   directives: {
@@ -222,13 +216,10 @@ export default {
           /><issue-time-estimate
             v-if="issue.timeEstimate"
             :estimate="issue.timeEstimate"
-<<<<<<< HEAD
           /><issue-card-weight
             v-if="issue.weight"
             :weight="issue.weight"
             @click="filterByWeight(issue.weight)"
-=======
->>>>>>> upstream/master
           />
         </span>
       </div>

app/assets/javascripts/boards/components/issue_time_estimate.vue

@@ -41,12 +41,7 @@ export default {
       placement="bottom"
       class="js-issue-time-estimate"
     >
-<<<<<<< HEAD
-      <span class="bold">{{ __('Time estimate') }}</span>
-      <br /> 
-=======
       <span class="bold d-block">{{ __('Time estimate') }}</span>
->>>>>>> upstream/master
       {{ title }}
     </gl-tooltip>
   </span>

app/assets/stylesheets/pages/boards.scss

@@ -722,7 +722,6 @@
   }
 }
 
-<<<<<<< HEAD
 .boards-switcher {
   padding-right: 10px;
 }
@@ -766,8 +765,6 @@
   }
 }
 
-=======
->>>>>>> upstream/master
 .board-card-info {
   color: $gl-text-color-secondary;
   white-space: nowrap;

app/controllers/boards/issues_controller.rb

@@ -105,21 +105,7 @@ module Boards
     end
 
     def serialize_as_json(resource)
-<<<<<<< HEAD
-      resource.as_json(
-        only: [:id, :iid, :project_id, :title, :confidential, :due_date, :relative_position, :weight, :time_estimate],
-        labels: true,
-        issue_endpoints: true,
-        include_full_project_path: board.group_board?,
-        include: {
-          project: { only: [:id, :path] },
-          assignees: { only: [:id, :name, :username], methods: [:avatar_url] },
-          milestone: { only: [:id, :title] }
-        }
-      )
-=======
       serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
->>>>>>> upstream/master
     end
 
     def whitelist_query_limiting