js code merge - fix