fix regression after conflicts solving