Merge issue with javascript

-