add b1
modify test.txt
delete confliction
add b2 and modify test.txt
delete b2 confliction