Commiting setter trait for ConditionInterface
typo
Fixing conflict