code comeback after git problems