fix merge conflict
add nohighlights function