Resolve conflicts with html.js