modify and fix git merge --no-ff, make it develop specific