change text on hover
solve conflict