diff --git a/web/package.json b/web/package.json
index 87ecd2775..8cb77c3d5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,10 +1,6 @@
 {
   "name": "web",
-<<<<<<< HEAD
-  "version": "0.1.4",
-=======
   "version": "0.1.6",
->>>>>>> origin/evals
   "private": true,
   "scripts": {
     "dev": "next dev --turbo",