typo highlighting
Fixing the merge issue