git problems resolved