stuck on git (again)