conclusion: adding git image
conclusion: updating git image
Merge branch 'master' of https://github.com/edgrip/formationgit
Merge branch 'master' of https://github.com/edgrip/formationgit
resolving conflict
Merge branch 'master' of https://github.com/edgrip/formationgit