initial commit
fix README.md conflict