added git imerge / git when-merged