new branch.txt
f
a
conflict OK