Resolve conflict in app/assets/stylesheets/framework.scss

app/assets/stylesheets/framework.scss

@@ -3,10 +3,7 @@
 @import 'framework/tw_bootstrap_variables';
 @import 'framework/tw_bootstrap';
 @import 'framework/layout';
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/master
 @import 'framework/animations';
 @import 'framework/vue_transitions';
 @import 'framework/avatar';
@@ -62,9 +59,6 @@
 @import 'framework/memory_graph';
 @import 'framework/responsive_tables';
 @import 'framework/stacked_progress_bar';
-<<<<<<< HEAD
 @import 'framework/sortable';
-=======
->>>>>>> upstream/master
 @import 'framework/ci_variable_list';
 @import 'framework/feature_highlight';