diff --git a/resource_conflict.module b/resource_conflict.module
index 55a2328..1b61bed 100644
--- a/resource_conflict.module
+++ b/resource_conflict.module
@@ -249,11 +249,17 @@ function resource_conflict_form_submit($form, &$form_state) {
   $type = $form_state['values']['type'];
   $conflict_types = variable_get("rc_types", array());
 
-  //make new entry if this type is conflict handled
+  // make new entry if this type is conflict handled
   if (isset($form_state['values']['rc_type'])&&($form_state['values']['rc_type'])) {
-    $conflict_types[] = $type;
+    // only add entry if it's not already there
+    if (!in_array($type, $conflict_types)) {
+      $conflict_types[] = $type;
+    }
+  }
+  // remove from array if conflict handling has been deselected for this type
+  elseif (in_array($type, $conflict_types)) {
+      $conflict_types = array_diff($conflict_types, array($type));
   }
-
   variable_set("rc_types", $conflict_types);
 }