Merged dev and resolved conflicts

Author: sandeep-vedam

package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.11.5",
     "@lightningjs/core": "^2.12.0",
-    "@metrological/sdk": "^1.0.0",
+    "@metrological/sdk": "^1.0.2",
     "@michieljs/execute-as-promise": "^1.0.0",
     "deepmerge": "^4.2.2",
     "is-plain-object": "^5.0.0",