Added text
Fixed merge
Merged files