pretty js
pretty merge
main.js
changes to js?