From 73a97fdbeabfe69951374beaff38b747da65e885 Mon Sep 17 00:00:00 2001
From: Enzo Lizama <lizama.enzo@gmail.com>
Date: Wed, 5 Oct 2022 23:55:01 -0500
Subject: [PATCH] fix: conflict merge

---
 .../app_flowy/packages/appflowy_editor/example/lib/main.dart    | 2 +-
 .../example/lib/plugin/tex_block_node_widget.dart               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/main.dart b/frontend/app_flowy/packages/appflowy_editor/example/lib/main.dart
index fecec3d3e0..4283752a03 100644
--- a/frontend/app_flowy/packages/appflowy_editor/example/lib/main.dart
+++ b/frontend/app_flowy/packages/appflowy_editor/example/lib/main.dart
@@ -128,7 +128,7 @@ class _MyHomePageState extends State<MyHomePage> {
                 underscoreToItalic,
               ],
               selectionMenuItems: [
-                codeBlockMenuItem,
+                codeBlockItem,
                 teXBlockMenuItem,
               ],
             ),
diff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/tex_block_node_widget.dart b/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/tex_block_node_widget.dart
index 80ad3642ca..e76c3e160b 100644
--- a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/tex_block_node_widget.dart
+++ b/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/tex_block_node_widget.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_math_fork/flutter_math.dart';
 
 SelectionMenuItem teXBlockMenuItem = SelectionMenuItem(
-  name: 'Tex',
+  name: () => 'Tex',
   icon: const Icon(Icons.text_fields_rounded),
   keywords: ['tex, latex, katex'],
   handler: (editorState, _, __) {