Revert "fix conflict sentence"

This reverts commit 964a85e6723b0de0ec92107e07875a2f3ac4afd2.