diff --git a/src/filtre.cpp b/src/filtre.cpp
index 1efea52..6a49b15 100644
--- a/src/filtre.cpp
+++ b/src/filtre.cpp
@@ -32,10 +32,10 @@ class Callback {
       assert(zmax > 0);
       assert(hue >= 0);
       assert(hue <= 360.);
-      assert(sat >= 0);
-      assert(sat <= 1.);
-      assert(val >= 0);
-      assert(val <= 1.);
+      assert(sat_min >= 0);
+      assert(sat_max <= 1.);
+      assert(val_min >= 0);
+      assert(val_max <= 1.);
     }
 
   private:
@@ -68,22 +68,14 @@ class Callback {
       return std::min(diff1, diff2);
     }
 
-<<<<<<< HEAD
     float sat(const Point& pt)
-=======
-    float sat_dist(const Point& pt)
->>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
     {
       float h, s, v, diff1, diff2;
       pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);
       return s;
     }
 
-<<<<<<< HEAD
     float val(const Point& pt)
-=======
-    float val_dist(const Point& pt)
->>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
     {
       float h, s, v, diff1, diff2;
       pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);