diff --git a/crates/ruff_python_ast/src/node.rs b/crates/ruff_python_ast/src/node.rs
index 4cb56bfb42c9ff..ed1ab59a9e1842 100644
--- a/crates/ruff_python_ast/src/node.rs
+++ b/crates/ruff_python_ast/src/node.rs
@@ -3153,11 +3153,7 @@ impl From<Stmt> for AnyNode {
             Stmt::Pass(node) => AnyNode::StmtPass(node),
             Stmt::Break(node) => AnyNode::StmtBreak(node),
             Stmt::Continue(node) => AnyNode::StmtContinue(node),
-<<<<<<< HEAD
             Stmt::LineMagic(node) => AnyNode::StmtLineMagic(node),
-=======
-            Stmt::LineMagic(_) => todo!(),
->>>>>>> 4d5259219 (New AST nodes `todo!()`)
         }
     }
 }
@@ -3192,11 +3188,7 @@ impl From<Expr> for AnyNode {
             Expr::List(node) => AnyNode::ExprList(node),
             Expr::Tuple(node) => AnyNode::ExprTuple(node),
             Expr::Slice(node) => AnyNode::ExprSlice(node),
-<<<<<<< HEAD
             Expr::LineMagic(node) => AnyNode::ExprLineMagic(node),
-=======
-            Expr::LineMagic(_) => todo!(),
->>>>>>> 4d5259219 (New AST nodes `todo!()`)
         }
     }
 }