Update .gitignore

resolved merge conflict in .gitignore