email.html and square.html
merge