revert text change to avoid merge conflict