diff --git a/README.md b/README.md
index 209914a..37cd627 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,2 @@
 # fastapi-postgres-gitops
-<<<<<<< HEAD
-=======
 
->>>>>>> e69b98f4d0a62138085e95628db4f9a2b4e559d5