git error resolved