added highlights for selected comment
solved merge conflict