Conflicts: A Better Way to Resolve Them