One more conflict resolution