fix the git problems