diff --git a/file1.txt b/file1.txt
index d422347..c8ffb8f 100644
--- a/file1.txt
+++ b/file1.txt
@@ -4,3 +4,5 @@ adding more code
 vuhwvhf okmpg3ng ;ihtg
 
 ghfjdt
+
+Hi there !!!!
diff --git a/file2.txt b/file2.txt
index ac98330..c4b69bc 100644
--- a/file2.txt
+++ b/file2.txt
@@ -2,5 +2,16 @@
 i am in branch1 
 trying merging branch
 
+<<<<<<< HEAD
+
+
+
+
+
+
+
+Hello ! 
+=======
 I am a change
-Trying to make a change
\ No newline at end of file
+Trying to make a change
+>>>>>>> f3280a6109063f0ab55b73717001e4de507c4eea