I don't know why these are here, but it always annoys the shit out of me.
Remove one additional botched merge