teaching about branches
causing a merge conflict
Merge branch 'matts'
week 2 homework"