# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/gl_dropdown.js
#	app/assets/javascripts/labels_select.js
#	changelogs/unreleased-ee/4929-internationalize-lock-files.yml
#	config/webpack.config.js
#	ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
#	ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml

[ci skip]