Fixed files

Github added some junk to a file when I had a merge conflict. Fixed it.