changed icon
merge conflicts