merge local changes with build - multiwrite cleanup