fix buildConditionGroup
fix conflict