resolve conflicts in main.js

app/assets/javascripts/main.js

@@ -44,11 +44,6 @@ import './commits';
 import './compare';
 import './compare_autocomplete';
 import './confirm_danger_modal';
-<<<<<<< HEAD
-import './diff';
-import './files_comment_button';
-=======
->>>>>>> upstream/master
 import Flash, { removeFlashClickListener } from './flash';
 import './gl_dropdown';
 import './gl_field_error';