diff --git a/dailyjs/basic-call/package.json b/dailyjs/basic-call/package.json
index 34844a0..495f694 100644
--- a/dailyjs/basic-call/package.json
+++ b/dailyjs/basic-call/package.json
@@ -20,8 +20,5 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "next-compose-plugins": "^2.2.1",
     "next-transpile-modules": "^8.0.0"
-  },
-  "engines": {
-    "node": ">=0.12"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index d08780e..477124f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,17 +160,10 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
-<<<<<<< HEAD
-"@daily-co/daily-js@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@daily-co/daily-js/-/daily-js-0.14.0.tgz#29308c77e00886514df7d932d771980d5cdb7618"
-  integrity sha512-OD2epVohYraTfOH/ZuO5rP9Ej4Rfu/ufGXX0XJQG+mAu1hJ1610JWunnszTmfhk+uUH4aA9i7+5/PQ2meOXUtQ==
-=======
 "@daily-co/daily-js@^0.15.0":
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/@daily-co/daily-js/-/daily-js-0.15.0.tgz#9dfd5c3ed8855df31c370d5b21a3b5098cce3c4f"
   integrity sha512-rnivho7yx/yEOtqL81L4daPy9C/FDXf06k06df8vmyUXsE8y+cxSTD7ZvYIJDGJHN6IZRhVxxfbCyPI8CHfwCg==
->>>>>>> 1068a9f75322d380546319034f8c236029567085
   dependencies:
     "@babel/runtime" "^7.12.5"
     bowser "^2.8.1"