Update default.html

!
solve conflict
Merge branch 'content_'