remove single html
Fix merge conflict