please merge.. i deleted some stuff in the html