update
conflict res