diff --git a/package.json b/package.json
index 03b4898..e28483d 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,7 @@
   },
   "private": true,
   "version": "1.2.5",
-<<<<<<< Updated upstream
   "buildDate": "2025/12/15 21:21:23",
-=======
-  "buildDate": "2025/12/15 21:59:38",
->>>>>>> Stashed changes
   "main": "dist-electron/main.js",
   "type": "module",
   "scripts": {