fixed last conflict