removed html files
merging fix