Resolve confidential_issue_sidebar

app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue

@@ -39,14 +39,7 @@
       updateConfidentialAttribute(confidential) {
         this.service.update('issue', { confidential })
           .then(() => location.reload())
-<<<<<<< HEAD
           .catch(() => new Flash('Something went wrong trying to change the confidentiality of this issue'));
-=======
-          .catch(() => {
-            Flash(`Something went wrong trying to
-  change the confidentiality of this issue`);
-          });
->>>>>>> upstream/master
       },
     },
   };