Fixed merge conflict for README