fixed conflict commonJsSetup