removed merge conflict junk

Somehow it got in here :(