Fix js
Fix firebase push
Merge