Small text changes
Conflict resolved.