From 5c74c311360dee6a4454807882ba4fa97ae19827 Mon Sep 17 00:00:00 2001
From: Marshall Asch <maasch@rogers.com>
Date: Mon, 16 Sep 2019 13:20:52 -0400
Subject: [PATCH] conflicting changes

---
 file.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/file.txt b/file.txt
index d228e96..c319c34 100644
--- a/file.txt
+++ b/file.txt
@@ -1,2 +1,5 @@
-file 1
+file 45433
 editeed
+
+
+This is a file with clonflicting changes