Recovering after git fail + almost all ATM is finished