remove
Merge branch 'newbranch1'
fo
Merge remote-tracking branch 'origin' into newbranch1
conflict