Remove junk left by merge conflict