A sample git merge