fix tablesorter header css
fix merge
fix merge