resolve some git problems