first commit
add README.md, fix conflict