[Bug 225218] New: conflict resolver during update does not go away