Prep for goldeneye merge