third version that is going to conflict
Merge branch 'master' of https://github.com/pietrop/hellogit