[Bug 223750] When solving conflicts, I have to confirm every change twice