Adding js files
Fixing merge
Updating head
fixing merge conflicts