diff --git a/ui-kit/flutter/message-template.mdx b/ui-kit/flutter/message-template.mdx
index 0f2313810..68f0b9345 100644
--- a/ui-kit/flutter/message-template.mdx
+++ b/ui-kit/flutter/message-template.mdx
@@ -1,9 +1,6 @@
 ---
 title: "Message Template"
-<<<<<<< HEAD
 description: "Data structure for customizing CometChat Flutter UI Kit message bubbles, including content, header, footer, reply, and status views."
-=======
->>>>>>> f976b5eb38499979c0dd80a0ce5f9aa888398c08
 ---
 
 ## Overview