Update .gitignore resolving conflict