Added collaborated merge conflict exercise