Javascript code
Fix conflict