README.md edited online with Bitbucket
fix bitbucket merge conflict