Fixing Crazy Git Disaster1