add higlight-active to table
fix merge issue