more conflict recovery