diff --git a/testfile b/testfile
index de4e7cb..55e31d8 100644
--- a/testfile
+++ b/testfile
@@ -1 +1,2 @@
+testing merge conflicts
 Hi ... hi Karthi how are you.....