diff --git a/BGL/include/CGAL/boost/graph/parameters_interface.h b/BGL/include/CGAL/boost/graph/parameters_interface.h
index fc574f133c6..337697f31ec 100644
--- a/BGL/include/CGAL/boost/graph/parameters_interface.h
+++ b/BGL/include/CGAL/boost/graph/parameters_interface.h
@@ -65,16 +65,13 @@ CGAL_add_named_parameter(nb_points_per_distance_unit_t, nb_points_per_distance_u
 CGAL_add_named_parameter(outward_orientation_t, outward_orientation, outward_orientation)
 CGAL_add_named_parameter(overlap_test_t, overlap_test, do_overlap_test_of_bounded_sides)
 CGAL_add_named_parameter(preserve_genus_t, preserve_genus, preserve_genus)
-<<<<<<< HEAD
 CGAL_add_named_parameter(gradient_descent_precision_t, gradient_descent_precision, gradient_descent_precision)
 CGAL_add_named_parameter(use_explicit_scheme_t, use_explicit_scheme, use_explicit_scheme)
-=======
 CGAL_add_named_parameter(apply_per_connected_component_t, apply_per_connected_component, apply_per_connected_component)
 CGAL_add_named_parameter(projection_functor_t, projection_functor, projection_functor)
 CGAL_add_named_parameter(throw_on_self_intersection_t, throw_on_self_intersection, throw_on_self_intersection)
 CGAL_add_named_parameter(clip_volume_t, clip_volume, clip_volume)
 CGAL_add_named_parameter(use_compact_clipper_t, use_compact_clipper, use_compact_clipper)
->>>>>>> master
 
 // List of named parameters that we use in the package 'Surface Mesh Simplification'
 CGAL_add_named_parameter(get_cost_policy_t, get_cost_policy, get_cost)
diff --git a/BGL/test/BGL/test_cgal_bgl_named_params.cpp b/BGL/test/BGL/test_cgal_bgl_named_params.cpp
index 7fb6088ef0b..bc984fd3913 100644
--- a/BGL/test/BGL/test_cgal_bgl_named_params.cpp
+++ b/BGL/test/BGL/test_cgal_bgl_named_params.cpp
@@ -80,13 +80,13 @@ void test(const NamedParameters& np)
   assert(get_param(np, CGAL::internal_np::use_explicit_scheme).v == 48);
 
     // Named parameters that we use in the package 'Surface Mesh Simplification'
-  assert(get_param(np, CGAL::internal_np::get_cost_policy).v == 36);
-  assert(get_param(np, CGAL::internal_np::get_placement_policy).v == 37);
+  assert(get_param(np, CGAL::internal_np::get_cost_policy).v == 34);
+  assert(get_param(np, CGAL::internal_np::get_placement_policy).v == 35);
 
     // To-be-documented named parameters
-  assert(get_param(np, CGAL::internal_np::face_normal).v == 38);
-  assert(get_param(np, CGAL::internal_np::random_seed).v == 39);
-  assert(get_param(np, CGAL::internal_np::do_project).v == 40);
+  assert(get_param(np, CGAL::internal_np::face_normal).v == 36);
+  assert(get_param(np, CGAL::internal_np::random_seed).v == 37);
+  assert(get_param(np, CGAL::internal_np::do_project).v == 38);
 
     // Internal named parameters
   assert(get_param(np, CGAL::internal_np::weight_calculator).v == 39);
@@ -152,13 +152,13 @@ void test(const NamedParameters& np)
   check_same_type<48>(get_param(np, CGAL::internal_np::use_explicit_scheme));
 
     // Named parameters that we use in the package 'Surface Mesh Simplification'
-  check_same_type<36>(get_param(np, CGAL::internal_np::get_cost_policy));
-  check_same_type<37>(get_param(np, CGAL::internal_np::get_placement_policy));
+  check_same_type<34>(get_param(np, CGAL::internal_np::get_cost_policy));
+  check_same_type<35>(get_param(np, CGAL::internal_np::get_placement_policy));
 
     // To-be-documented named parameters
-  check_same_type<38>(get_param(np, CGAL::internal_np::face_normal));
-  check_same_type<39>(get_param(np, CGAL::internal_np::random_seed));
-  check_same_type<40>(get_param(np, CGAL::internal_np::do_project));
+  check_same_type<36>(get_param(np, CGAL::internal_np::face_normal));
+  check_same_type<37>(get_param(np, CGAL::internal_np::random_seed));
+  check_same_type<38>(get_param(np, CGAL::internal_np::do_project));
 
     // Internal named parameters
   check_same_type<39>(get_param(np, CGAL::internal_np::weight_calculator));