new_b2 created.
test.txt modified.
conflict resolved.