- changed readme to add the --no-ff value in git merge