Fix merge error in application.properties