Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example