fixed weird problem with <<<<< HEAD >>>>> being inserted throughout code

hope that doesn't happen again. had to delete a bunch of weird stuff
that got inserted with the last git push and broke the code. I will not
push the corrected code, and hopefully that problem doesn't happen
again.