Fix derp

Looked like some sort of merge conflict marker <<<<<<<<< etc...