diff --git a/lib/widgets/text_selection.dart b/lib/widgets/text_selection.dart
index a2621cbf..22b687b2 100644
--- a/lib/widgets/text_selection.dart
+++ b/lib/widgets/text_selection.dart
@@ -722,7 +722,6 @@ class _EditorTextSelectionGestureDetectorState
     );
   }
 }
-<<<<<<< HEAD
 
 class _TransparentTapGestureRecognizer extends TapGestureRecognizer {
   _TransparentTapGestureRecognizer({
@@ -738,5 +737,3 @@ class _TransparentTapGestureRecognizer extends TapGestureRecognizer {
     }
   }
 }
-=======
->>>>>>> dda5805935568d42b71a1a1faf7fbdf078d72633