add git tag alias
add git merge --no-ff alias
modify and fix git merge --no-ff, make it develop specific
Merge branch 'develop'