Resolve conflicts with html.js

(cherry picked from commit 8362427ebd661b5afd8fea8ca7c894876750e1e7)