new js code
change js code
add else
Merge branch 'somejs' into new-css
Merge branch 'new-css'