add icon to index
fix merge conflict