removed more conflict stuff