diff --git a/index.html b/index.html
index 8d79e05..5a121e8 100644
--- a/index.html
+++ b/index.html
@@ -13,13 +13,7 @@
             <li>sand</li>
         </ul>
     </div>
-<<<<<<< HEAD
 
-    <module-two>
-        <div>my awesome new module about news</div>
-    </module-two>
-=======
-    <p>hello</p>
->>>>>>> master
+<span>contents added for branch feature2</span>
 </body>
 </html>
\ No newline at end of file