edit confic
Merge branch 'master' of github.com:flyingnati/try-git-2