Fix conflict in app/views/shared/issuable/_sidebar.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/shared/issuable/_sidebar.html.haml

 - todo = issuable_todo(issuable)
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
-<<<<<<< HEAD
   = webpack_bundle_tag('ee_sidebar')
-=======
-  = webpack_bundle_tag('sidebar')
->>>>>>> upstream/master
 
 %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { signed: { in: current_user.present? } }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
   .issuable-sidebar{ data: { endpoint: "#{issuable_json_path(issuable)}" } }