Create branch 2.
Other change in branch 2.
Automatic conflict resolve.
Merge remote-tracking branch 'origin/master'