Fix the git plugin merge command, see #326