git screwed something up