Update README.md
1st commit in branch
resolve conflict