# Conflicts:
#	app/assets/javascripts/ide/components/ide_context_bar.vue
#	app/assets/javascripts/ide/components/repo_commit_section.vue
#	app/assets/javascripts/ide/stores/actions.js
#	doc/README.md
#	doc/user/project/merge_requests/index.md

[ci skip]