more conflict fixes.