diff --git a/crates/solidity/outputs/cargo/crate/generated/public_api.txt b/crates/solidity/outputs/cargo/crate/generated/public_api.txt
index 367836d6b1..2b9673643b 100644
--- a/crates/solidity/outputs/cargo/crate/generated/public_api.txt
+++ b/crates/solidity/outputs/cargo/crate/generated/public_api.txt
@@ -953,13 +953,9 @@ impl slang_solidity::parser::ParseOutput
 pub fn slang_solidity::parser::ParseOutput::create_tree_cursor(&self) -> slang_solidity::cst::Cursor
 pub fn slang_solidity::parser::ParseOutput::errors(&self) -> &alloc::vec::Vec<slang_solidity::parser::ParseError>
 pub fn slang_solidity::parser::ParseOutput::is_valid(&self) -> bool
-<<<<<<< HEAD
-pub fn slang_solidity::parser::ParseOutput::tree(&self) -> &slang_solidity::cst::Node
+pub fn slang_solidity::parser::ParseOutput::tree(&self) -> alloc::rc::Rc<slang_solidity::cst::NonterminalNode>
 impl core::clone::Clone for slang_solidity::parser::ParseOutput
 pub fn slang_solidity::parser::ParseOutput::clone(&self) -> slang_solidity::parser::ParseOutput
-=======
-pub fn slang_solidity::parser::ParseOutput::tree(&self) -> alloc::rc::Rc<slang_solidity::cst::NonterminalNode>
->>>>>>> 26d5e003 (Changing parse_result to return a NonTerminalNode instead of a Node)
 impl core::cmp::PartialEq for slang_solidity::parser::ParseOutput
 pub fn slang_solidity::parser::ParseOutput::eq(&self, other: &slang_solidity::parser::ParseOutput) -> bool
 impl core::fmt::Debug for slang_solidity::parser::ParseOutput