first commit
solve confict in README.md