Fixing Crazy Git Disaster2