update after conflict