better update
conflict