branch br1
add something
Merge branch 'br1'
iss1
dd
iss1
solve conflict
iss2
ddfdfd
iss.txt
Merge branch 'iss2'
dd