update entry list
conflict