conflict test
more conflict tests