Merge conflict example for Git workshop - View it on GitHub