resolve conflicts and add .gitignore