One more conflict fix