prep for merge with will