Updated .gitignore
Resolved merge conflicts