Resolve mr_notes/stores/index.js

app/assets/javascripts/mr_notes/stores/index.js

@@ -13,10 +13,7 @@ export const createStore = () =>
       page: mrPageModule,
       notes: notesModule(),
       diffs: diffsModule(),
-<<<<<<< HEAD
       batchComments: batchCommentsModule(),
-=======
->>>>>>> upstream/master
     },
   });