Hopefully removes confilcts in gh-pages