Add git merge conflicts article