Merge Issue Fix - Highlight