Textual changes
Merge conflict fixed