Bug 9302: (QA follow-up) Merge should be a transaction