diff --git a/.gitignore b/.gitignore
index 9560e8f5f..affc88c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,10 +47,6 @@ local/*
 .idea/*
 include/tfpdf/font/unifont/*
 html/ads.html
-<<<<<<< HEAD
-/nbproject/private/
-=======
 doc/code/*
 nbproject/private/
 
->>>>>>> unstable