diff --git a/.gitignore b/.gitignore
index b2aba0a863..a68af84071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,4 @@ dev/yasd_init.php
 .phpunit.result.cache
 Makefile
 appwrite.json
-<<<<<<< HEAD
 /.zed/