even more conflict resolution