Resolving a Conflict, Fixing Resolve