several changes after a push failure