Added Icon
merge conflict