add .gitignore
resolve conflicts