Fleshed out conflict resolution spec a little more.