master で conflict
dummy1
インクリメント 1->2 #1
Merge remote-tracking branch 'remotes/origin/b1' into b1