add file gitignore
fix README.md conflicts