add new html files
fixed file conflicts