# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb