automatic git merge fixed