From 65a8244b1010324d95ef8d6dbea4cf9f21e5bb65 Mon Sep 17 00:00:00 2001
From: Wes <wes.d.nichols@gmail.com>
Date: Fri, 2 Oct 2015 09:44:27 -0700
Subject: [PATCH] Redefined 'Good'

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

diff --git a/conflict.txt b/conflict.txt
index 6a82720..bb1346c 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,3 @@
-git is good at conflict resolution.
+git is somewhat efficient at conflict resolution.
 
 please keep your line here: