modify a file
01
conflict
aa
aad
001
001
conflict
001
a bug
2
;
001