diff --git a/package.json b/package.json
index 680d7e30f975f..ce24eff3e7402 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,7 @@
   "version": "11.0.0-pre",
   "repository": "github:grafana/grafana",
   "scripts": {
-<<<<<<< HEAD
-    "LOGZIO CHANGE :: DEV-44343 - fix run with NX": true,
     "build": "NODE_ENV=production webpack --config scripts/webpack/webpack.prod.js",
-=======
-    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
->>>>>>> main
     "build:nominify": "yarn run build -- --env noMinify=1",
     "dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js",
     "e2e": "./e2e/start-and-run-suite",
diff --git a/yarn.lock b/yarn.lock
index d903d636e526a..bf726f49c3d34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24906,7 +24906,7 @@ __metadata:
 "poll-until-promise@npm:4.0.4":
   version: 4.0.4
   resolution: "poll-until-promise@npm:4.0.4"
-  checksum: be64f296e1276f73e9c62e78cc0eee63e7bc96fd8765478121aed3285d85d5dbc5be255c70cd74d9571f0da6e5ac44c870261b71f503272c6888f76d4e00ce9e
+  checksum: 10/be64f296e1276f73e9c62e78cc0eee63e7bc96fd8765478121aed3285d85d5dbc5be255c70cd74d9571f0da6e5ac44c870261b71f503272c6888f76d4e00ce9e
   languageName: node
   linkType: hard