resolving one more conflict