Fixed merge conflict
[easylist] / welcome