fixing git problems