create the base html
resolved conflict