# Conflicts:
#	Gemfile.lock
#	app/helpers/branches_helper.rb
#	app/services/projects/update_pages_service.rb
#	app/views/projects/branches/index.html.haml
#	config/prometheus/additional_metrics.yml
#	db/schema.rb
#	doc/user/project/integrations/prometheus_library/kubernetes.md

[ci skip]