add merge
merge with no-ff
The dev is ongoing
issue-001 fixed
This is the master branch.
conflict fixed
new features're finished.
Merge new features.
“
Dev finished
New features are merged now