Conflict resolution in progress