fixed js merge