merge fix and js update