Fix last conflict