This must be the core problem - doing some sort of bad merge or rebase. Probably why kris and I didn't have files in our runs that we should have had