Update .gitignore merging conflicts