Merge script fixup.