Line3 added
Line4 added
Comment
Merge branch 'b1'
Comment2 to B2
Added 2. line
Conflict