Git practice
add merge
merge with no-ff
add merge
merge no-ff