DROOLS-7 reverted conflict resolver, to allow examples to pass