started out the website
fixed merge fails