Corected git merge.