fix conflict Sentence