minor text changes
Fixed merge conflict