fix .gitignore
more README
fix README conflict