# Conflicts:
#	Gemfile.lock
#	app/models/repository.rb
#	app/views/projects/merge_requests/show.html.haml
#	app/views/shared/_import_form.html.haml
#	doc/api/merge_requests.md
#	doc/ci/variables/README.md
#	doc/ci/variables/where_variables_can_be_used.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/merge_requests/squash_and_merge.md
#	lib/api/settings.rb
#	lib/api/v3/merge_requests.rb
#	spec/fixtures/api/schemas/entities/merge_request_widget.json
#	spec/fixtures/api/schemas/public_api/v3/merge_requests.json
#	spec/fixtures/api/schemas/public_api/v4/merge_requests.json

[ci skip]