Tried unbreaking git's mess