add test.txt
add a line in test.txt
1123
and simple
& simple
conflict fixed
add 2
spce
add a line 17:37
modify 2
all solve