Bug 5270: Fix merging