add addbranch.txt
AND simple
& simple
conflict fixed