more conflict stuff