b1 add
master add
master change it again
master come
b1 come
master come again
b1 modify
master modify
master modify again
b1
“hh
b1 add line 6
master add line
master add line 7
bug has been repaired