minor text change
Fixed conflicts.