diff --git a/MergeConflictExercise b/MergeConflictExercise
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/MergeConflictExercise
@@ -0,0 +1 @@
+
diff --git a/merging.html b/merging.html
index 39e0087..58a2199 100644
--- a/merging.html
+++ b/merging.html
@@ -1,6 +1,2 @@
 <h1>Heading</h1>
-<table>
-    <tr>
-        <th>Header</th>
-    </tr>
-</table>
\ No newline at end of file
+