added icons, fixed merging and excluding