The server now use commonjs export system
Merge fixed