remove last sentence
fix the conflict from the last merge