test1_a commit
Change in branch 1_b
change in master
Fix merge conflict