Added a merge conflict example