merge js v5.4