diff --git a/index.html b/index.html
index db18b54..c9afcad 100644
--- a/index.html
+++ b/index.html
@@ -6,9 +6,23 @@
Document
+<<<<<<< HEAD
+
+ A test of push in cli new_b
+ Added new heading
+
+ Added h2 heading and third and fourth
+
+ Added h2 heading and third
+ added paragraph
+
+ this is another things
+
+=======
Yes
No
+>>>>>>> 0e0ffcd7e549904cd9a01834412f468d82ddf83b