moved models out of index.html
fixed merge