diff --git a/.gitignore b/.gitignore
index aa35c27..fd4d2ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-**/__pycache__/
-=======
 # Exclude everything.
 *
 
@@ -26,4 +23,3 @@ __pycache__/
 .pytest_cache/
 tests/profiler.py
 tests/test_bench.py
->>>>>>> main