# Conflicts:
#	app/assets/javascripts/merge_request_widget.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/pipelines/components/stage.js
#	app/assets/javascripts/pipelines/components/stage.vue
#	app/assets/javascripts/project_new.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
#	app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
#	app/assets/javascripts/vue_shared/components/memory_graph.js
#	app/assets/stylesheets/framework/lists.scss
#	app/assets/stylesheets/framework/memory_graph.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	app/c...