Update highlight modules
Resolved conficts