share icons before change file merge
merge changes