Remove highlight
Highlight on node
merge
Fix merge