Updated .gitignore to resolve conflict