better non-conflicting version