after conflict update