addText
Merge Conflict
Merge conflict