more conflict resolution