Remove merge conflict junk

It was still there, maybe because I  forgot to remove it.