prep for merge