Text changes
Merge conflicts resolved