resolve Conflict