Think I fixed the website bug
added the site, referred to the fig
fixed our merge conflicts