merge last conflict