icons for table
solve conflict