branch test
AND simple
.\readme.txt
conflict fixed
add merge
resolve conflict
add branch
resovle conlict
fix bug 101
merged bug fix 101