Fixing merge conflict but now this branch is up to date with gh-pages