Fixed gh-pages merge problem