fixed merge conflicts
resolved some merge conflicts except for index.html