Fixing
Home js
Merge