add a readme.txt
for feather1
for master and feather1
confict fixed
b1
b2
conflict b1 b2
dev
merge with no-ff
fix bug
merge bug fix 1
test bug