and simple
& simple
conflict fixed
fix bug 101
merged bug fix 101
3 my job
Merge branch 'master' into feature1
5 other job
5 other job merged
6 job conflict