"git-resolve.sh" did not exist on "9585e406224b97b24b46131005b809a6612a3eac"