Fixing js
Fixing html
merge conflicts