Sound safety
conflict resolution