Add a line to my local master branch. However this will cause a conflict because the copy on origin is newer.
Fixed conflict in README.md