finish social icons
resolved conflicts on merging social-icons