diff --git a/lib/src/tree.dart b/lib/src/tree.dart
index 41ea62b..f68c879 100644
--- a/lib/src/tree.dart
+++ b/lib/src/tree.dart
@@ -900,7 +900,6 @@
 class Declaration extends TreeNode {
   final Identifier _property;
   final Expression _expression;
-<<<<<<< HEAD
 
   /// Style exposed to Dart.
   DartStyleExpression dartStyle;