fix last conflict