Prep for project merge