this ends up not being a clean merge after some of my work last night, make sure to merge carefully and re-test.