changing conflict resolution dialog