refactor the makefile .
add merge --no-ff into git alias