Minor change in wording
Fixed merge conflict