branch test
dev add simple
master add simple
conflct fixed
for merge test
merge with no-ff
fix issue101
merge bug fix issue101