branch Test
feature-1
master commit
conflict fixed
dev add
merge with no-ff
issue-101
merge issue-101
fix up