Finally fixed are git disaster