be sensible about conflicting updates