# Conflicts:
#	app/assets/javascripts/notes/components/noteable_discussion.vue
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/workers/stuck_import_jobs_worker.rb
#	doc/user/project/clusters/index.md
#	locale/gitlab.pot
#	spec/serializers/issue_serializer_spec.rb

[ci skip]