merge conflict fix
Merge branch 'master' of https://github.com/Cosmos-Browser/Cosmos-Browser.github.io