Remove some merge junk from trying to resolve git issues