diff --git a/README.md b/README.md
index 27f47e5..8b146b7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # smart_fe
 
 A new Flutter project.
@@ -14,3 +15,7 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+=======
+# TKK_E32221002
+
+>>>>>>> a20cc50a34263c6048d8818fe0ca986baf88831c