fix #17

hightligting working at depth 1 ( without zoom)
fix conflict