added git merge command