finally fixing all this merge junk. I hope.