add branch
creating a new branch
add & simple
conflict fixed
and simple
testing no-ff
merge with no-ff
add bugissue-101
mergr add issue-101