Update .gitignore
resolved some merge conflicts
resolved some merge conflicts