first commit
merge conflict in README.md