Conflicts:
	src/main/resources/application-production.yml
	target/classes/META-INF/build-info.properties
	target/classes/application-production.yml
	target/classes/git.properties