basic hightlighting functionality
Fixed merge conflicts