diff --git a/.gitignore b/.gitignore
index 82a5e7396391268d4e9577a1c7fa2318e0efcc73..4c5c21172f67b06b8a7956399a5e3763ebc547e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,5 @@ pairing/
 .cache
 .coverage
 .vscode
-<<<<<<< HEAD
 data/
-=======
-.idea/
->>>>>>> two_way_derivatives
+.idea/
\ No newline at end of file