modify db
modify conflict