#1 First commit in branch b_2
#2 Second commit in b_1
#2 Conflict resolved
Merge branch 'b_1'