Wasnt intentional bad merge.  Should have done a better spot check