Updated conflicting .gitignore