Function merge

pub fn merge(
    ancestor: &str,
    incoming_edit: &str,
    current: &str,
) -> Option<String>