Oh crap, the merge broke everything.  I am righting the wrong I have done!