clean up build after merge.  I wonder if fork is causing things to mess up on merges.  I thought I'd made these changes before