diff --git a/index2.html b/index2.html
index 527d414..7787f92 100644
--- a/index2.html
+++ b/index2.html
@@ -1 +1,7 @@
+
 <h1> This is the file creating on b1
+
+<h1> THis is the file created on branch b2
+editing++
+
+++to resolve conflict