add sentence
modify conflict