M1: first m1 commit
M1: second commit
Merge branch 'm1'