hljs, file api, other changes
bad merge