recommit of application.properties that was merged with conflict