Dealing with Unresolved Conflict