Manual mods to make the merge seamless