Remove a dumb line from a bad merge.