more conflict fixes