Better Than Conflict Resolution