diff --git a/index2.html b/index2.html
index a98a761..e155dc0 100644
--- a/index2.html
+++ b/index2.html
@@ -1 +1,6 @@
 <h1> THis is the file created on branch b2
+
+<h1> This is the file creating on b1
+ +++editing
+
+ to resolve merge conflict with branch b1