merge and add html2js