Add expressions for check.defaultStrategy and check.failBuildInCaseOfConflict