diff --git a/.dockerignore b/.dockerignore
index d16c1d2..799e216 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,3 @@
-
->>>>>>> ae64e5dc7a47ee24ac34e959ba6068f0182d2ba7
 venv/
 .vscide/
 .git/