rdkit: Unresolved conflicts in minimallib tests file blocks MinimalLib npm release of version 2022.3.1

I would like to release the npm release for 2022.3.1, but I would consider this as blocking.

File: https://github.com/rdkit/rdkit/blob/Release_2022_03_1/Code/MinimalLib/tests/tests.js

Note: there seems to be two files somewhat identical

• https://github.com/rdkit/rdkit/blob/Release_2022_03_1/Code/MinimalLib/tests/tests.js
• https://github.com/rdkit/rdkit/blob/Release_2022_03_1/Code/MinimalLib/tests.js

The dockerfile uses the one under the tests folder to confirm the build went correctly, see here . It currently breaks the build at the step where tests are run because of conflicts in the file used.

 > [build-stage 23/23] RUN nodejs tests.js:                                                                                                                                                   
#27 0.518 Adding directories to PATH:                                                                                                                                                         
#27 0.518 PATH += /opt/emsdk                                                                                                                                                                  
#27 0.518 PATH += /opt/emsdk/upstream/emscripten                                                                                                                                              
#27 0.518 PATH += /opt/emsdk/node/14.18.2_64bit/bin
#27 0.518 
#27 0.518 Setting environment variables:
#27 0.518 PATH = /opt/emsdk:/opt/emsdk/upstream/emscripten:/opt/emsdk/node/14.18.2_64bit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#27 0.518 EMSDK = /opt/emsdk
#27 0.518 EM_CONFIG = /opt/emsdk/.emscripten
#27 0.518 EMSDK_NODE = /opt/emsdk/node/14.18.2_64bit/bin/node
#27 0.989 /src/rdkit/Code/MinimalLib/tests/tests.js:521
#27 0.989 <<<<<<< HEAD
#27 0.989 ^^
#27 0.989 
#27 0.989 SyntaxError: Unexpected token <<
#27 0.989     at Module._compile (internal/modules/cjs/loader.js:723:23)
#27 0.989     at Object.Module._extensions..js (internal/modules/cjs/loader.js:789:10)
#27 0.989     at Module.load (internal/modules/cjs/loader.js:653:32)
#27 0.989     at tryModuleLoad (internal/modules/cjs/loader.js:593:12)
#27 0.989     at Function.Module._load (internal/modules/cjs/loader.js:585:3)
#27 0.989     at Function.Module.runMain (internal/modules/cjs/loader.js:831:12)
#27 0.989     at startup (internal/bootstrap/node.js:283:19)
#27 0.989     at bootstrapNodeJSCore (internal/bootstrap/node.js:623:3)

cc @greglandrum @ptosco