Fix bad merge

Looks like there was a bad merge somewhere.