Fix Bug for highlighting
Resolve conflict