branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
Commit For test Fast-forward merge
fixed issue-001
merge fixed issue-001
commit from dev
commit merge from dev branch