Fix Things Git Screwed Up