Resolve from git errors