b2 - adding conflict.txt
b1 - resolving merge conflict