Git hub spelling error

Spotted typo "GitGub"  in docs/conflicts.rst and fixed.