Resolve git corruption + spider update for consolidation