removed <<HEAD>>origin/gh-pages nonsense