Add: javascript syntax
Fix merge