Fixed more conflict markers (annoying)