Removed "-<<<<< HEAD" tags

They seemed to be causing a problem on the site so I removed them.