diff --git a/src/select/mod.rs b/src/select/mod.rs
index b6098aa..34f73fc 100644
--- a/src/select/mod.rs
+++ b/src/select/mod.rs
@@ -1027,15 +1027,7 @@ pub struct SelectorMut {
     value: Option<Value>,
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-fn replace_value<F: FnMut(Value) -> Value>(
-    mut tokens: Vec<String>,
-    value: &mut Value,
-    fun: &mut F,
-) {
-
-fn replace_value<F: FnMut(Value) -> Value>(mut tokens: Vec<String>, value: &mut Value, fun: &mut F) {
+fn replace_value<F: FnMut(Value) -> Option<Value>>(mut tokens: Vec<String>, value: &mut Value, fun: &mut F) {
     let mut target = value;
 
     let last_index = tokens.len() - 1;