fixed git problems