push foo conflict
fetch merge
Merge branch 'master' of https://github.com/ebarlas/gittest