s
Merge branch 'Branch1'
s
Merge branch 'origin/master'
a
local change
s
s
s