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