Merge fixup