# Conflicts:
#	pom.xml
#	src/main/resources/application-dev.yml
#	src/main/resources/application-test.yml
#	src/main/resources/application.yml