branch test
and simple
& simple
conflict fixed
add merge
merge with no-ff
fix issue 1
merged bug fix 1
add new feature
merge new feature to master