Fix crappy merge

we were working on the same thing