From 88444e09210a7be5e0b63ae46a719fdfc13ae6f8 Mon Sep 17 00:00:00 2001
From: Sam Mauck <smmauck@gmail.com>
Date: Sun, 11 Aug 2013 16:57:03 -0600
Subject: [PATCH] Improve conflict detector

---
 src/com/github/ss111/ConflictHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/github/ss111/ConflictHelper.java b/src/com/github/ss111/ConflictHelper.java
index e5c9fc6..7027f9d 100644
--- a/src/com/github/ss111/ConflictHelper.java
+++ b/src/com/github/ss111/ConflictHelper.java
@@ -40,13 +40,15 @@ public static Boolean isConflicting(MultiValueMap map, Integer key, String type)
 		} else {
 			
 			ArrayList<String> namesArray = new ArrayList<String>();
+			ArrayList<String> configArray = new ArrayList<String>();
 			
 			for (ArrayList<String> combo : names) {
 				
 				namesArray.add(combo.toArray()[0].toString());
+				configArray.add(combo.toArray()[1].toString());
 			}
 			
-			if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString())) {
+			if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString()) || configArray.toArray()[0].toString().equals(configArray.toArray()[1].toString())) {
 				
 				return false;