create a conflict adding this line
a line
back in branch test1 adding this line
ok
new
1
1
1