diff --git a/.gitignore b/.gitignore
index 9330be2..1e427a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,9 +166,6 @@ cython_debug/
 .DS_Store
 
 # Backup
-<<<<<<< HEAD
-backup
-=======
 backup
 examples/sweep/*.csv
->>>>>>> 2cb53ab (add missed files)
+examples/notebook/*/