add language specific highlighter
resolved conflic