diff --git a/merging.html b/merging.html
index a2b7790..e112a65 100644
--- a/merging.html
+++ b/merging.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <h2>Heading</h2>
+=======
+<h1>Heading</h1>
+>>>>>>> master
 <table>
     <tr>
         <th>Header</th>