add(article): add "Git: Merge and Conflicts"