Initialize repository
add .gitignore
fix the conflict of .gitignore