modified some text
merge conflict resolved