Add highlightjs and marked plugin dependencies
Resolve conflitos de merge