server work
conflict res