js merge fix