Added section about using Git.
Merge conflict.