more conflict!