Merge conflict - edit README file from the web.