Merged
Removed merge conflicts in index.html