diff --git a/demo-html b/demo-html
index 764688d..850c333 100644
--- a/demo-html
+++ b/demo-html
@@ -1 +1,3 @@
 demo.html
+adding new feature from feat1
+adding logic for conflict