updated .gitignore. removed merge conflicts