These diffs in main() are adding back in things that we had removed in recent commits.  I believe doing a merge with origin master
`git pull origin master` should clear that up.  Hopefully no merge conflicts!