diff --git a/CloudronManifest.json b/CloudronManifest.json
index 701713d..c71b773 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,13 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-<<<<<<< HEAD
-  "version": "3.3.3",
-  "upstreamVersion": "2022-12-12T19-27-27Z",
-=======
   "version": "3.4.0",
   "upstreamVersion": "2023-01-02T09-40-09Z",
->>>>>>> d881396 (Version 3.4.0)
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,