fix conflict sentence