text changes
merge