added git-imerge to flow