Context: fix last conflict resolve