merge in local changes, in prep for new work