This was a bad merge resolve