wording change
fix merge conflict