added README.md
resolve conflict README.md