Initial commit
Update README.md
Fix conflict