Fix git merge command