diff --git a/composer.json b/composer.json
index dbb78bfb1..78b0fd76c 100644
--- a/composer.json
+++ b/composer.json
@@ -32,11 +32,7 @@
 
         "appwrite/php-clamav": "1.0.*",
 
-<<<<<<< HEAD
-        "utopia-php/framework": "0.3.7",
-=======
         "utopia-php/framework": "0.4.0",
->>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
         "utopia-php/abuse": "0.2.*",
         "utopia-php/audit": "0.3.*",
         "utopia-php/cache": "0.2.*",
diff --git a/composer.lock b/composer.lock
index 957ddf5d1..a7d030f06 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
-    "content-hash": "1df9fdb337c6030db4bb5f0e9868f9c3",
-=======
     "content-hash": "7f6cbe77fe2e0f8bdff33c37a4d9ca11",
->>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
     "packages": [
         {
             "name": "appwrite/php-clamav",
@@ -1600,18 +1596,6 @@
         },
         {
             "name": "utopia-php/framework",
-<<<<<<< HEAD
-            "version": "0.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/utopia-php/framework.git",
-                "reference": "23156b3d604fd9586f2e8c6c449b2fc6a82c10bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/23156b3d604fd9586f2e8c6c449b2fc6a82c10bc",
-                "reference": "23156b3d604fd9586f2e8c6c449b2fc6a82c10bc",
-=======
             "version": "0.4.0",
             "source": {
                 "type": "git",
@@ -1622,7 +1606,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/utopia-php/framework/zipball/30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
                 "reference": "30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
->>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
                 "shasum": ""
             },
             "require": {
@@ -1653,11 +1636,7 @@
                 "php",
                 "upf"
             ],
-<<<<<<< HEAD
-            "time": "2020-06-21T11:29:58+00:00"
-=======
             "time": "2020-06-25T18:21:48+00:00"
->>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
         },
         {
             "name": "utopia-php/locale",