add higlight-active to table
fix merge issue
delete unnecessary files