usercomments on icon
fixed merge errors