fixup of ocerlay_merge