consolidated fork ff and merge into git-merge.sh