Fixed more conflict stuff