Solve last conflict remaining