Update Git & fixing conflicts.md