added highlight
added highlight/fixed merge conflict