modify server
modify conflict