Update git-resolve.sh