Added new link to git-guide from Janus.
Added section on conflict resoluiton.