Merge the bill template back into bill-html.jsp