merge error fixed

Author: rdevperu

package.json

@@ -3,6 +3,7 @@
   "private": true,
   "scripts": {
     "build": "lerna run build",
+    "test": "lerna run test",
     "lerna-publish": "lerna publish --no-private --conventional-commits",
     "lerna-publish-beta": "lerna publish --no-private --conventional-commits from-git --dist-tag beta"
   },

packages/core/package.json

@@ -21,6 +21,7 @@
     "prebuild-windows": "del /s /q dist",
     "prebuild": "rd -rf dist",
     "build": "yarn prebuild && tsc",
+    "build-windows": "yarn prebuild-windows && tsc",
     "start": "tsc --watch",
     "prepare": "install-peers",
     "test": "yarn prepare && yarn build && yarn jest"