diff --git a/Code/Seg/IPOLdemo/mainIPOL.cpp b/Code/Seg/IPOLdemo/mainIPOL.cpp
index 05639cfc9241540d753d2fa641d34a05058112da..5413561a26a39df4ab742ef778cb7f3b4fcf73c7 100755
--- a/Code/Seg/IPOLdemo/mainIPOL.cpp
+++ b/Code/Seg/IPOLdemo/mainIPOL.cpp
@@ -93,14 +93,9 @@ int main (int argc, char *argv[])
       }
     }
     fin.close();
-    cout << "siez i:"<< pts.size() << endl;
   }
   fout << "# Line detection generated from " << argv[0] << "with format : X1 Y1 X2 Y2 on each line" << std::endl;
-<<<<<<< HEAD
 
-=======
-  
->>>>>>> 98e75cffc2ac74f66288076537880443741a9cc8
   // Blurred segment detection
   vector<BlurredSegment *> bss;
   BSDetector detector;