add the static files needed to base and renamed the file index
resolved the conflicts