From eb1814e6351966282bbd19628e5b43e7ff57aa67 Mon Sep 17 00:00:00 2001
From: Sultanul Arefin <69816133+SultanulA@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:22:14 -0400
Subject: [PATCH 1/2] Create MergeConflictExercise

---
 MergeConflictExercise | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 MergeConflictExercise

diff --git a/MergeConflictExercise b/MergeConflictExercise
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/MergeConflictExercise
@@ -0,0 +1 @@
+

From 1a7051228bbbaa7160bc225baadb37f874056a30 Mon Sep 17 00:00:00 2001
From: Sultanul Arefin <69816133+SultanulA@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:35:52 -0400
Subject: [PATCH 2/2] Update merging.html

---
 merging.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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
+