From 9d6af116831ddb2f9ecb781aa9cbc971bb1ef1e4 Mon Sep 17 00:00:00 2001
From: dswiger <dswag89@gmail.com>
Date: Sat, 23 Oct 2021 12:17:19 -0400
Subject: [PATCH] Second commit for conflict

---
 e.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e.txt b/e.txt
index 7a2319a..d9083b7 100644
--- a/e.txt
+++ b/e.txt
@@ -1,3 +1,3 @@
 e
 
-Minor change
+Minor Change