Commit with conflict
Merge branch 'master' of github.com:afable/git-workshop-notes