Revert "resolve merge conflict"
Revert "resolve merge conflict"

This reverts commit 00c055bd0796720cab84f137eb48696b8cd246df.

carlokok/highlight.js,MakeNowJust/highlight.js,palmin/highlight.js,MakeNowJust/highlight.js,sourrust/highlight.js,highlightjs/highlight.js,Sannis/highlight.js,carlokok/highlight.js,StanislawSwierc/highlight.js,sourrust/highlight.js,highlightjs/highlight.js,bluepichu/highlight.js,teambition/highlight.js,carlokok/highlight.js,aurusov/highlight.js,teambition/highlight.js,isagalaev/highlight.js,bluepichu/highlight.js,palmin/highlight.js,MakeNowJust/highlight.js,highlightjs/highlight.js,Sannis/highlight.js,carlokok/highlight.js,sourrust/highlight.js,Sannis/highlight.js,isagalaev/highlight.js,aurusov/highlight.js,bluepichu/highlight.js,lead-auth/highlight.js,highlightjs/highlight.js,palmin/highlight.js,teambition/highlight.js,aurusov/highlight.js,StanislawSwierc/highlight.js