# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/resources/application-qa.properties