diff --git a/CHANGELOG b/CHANGELOG
index c6c06af..68b2d86 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,15 +9,7 @@ FIXED   bug in Nagios config importer where the first item was being skipped if
 
 ADDED   icon preview to the OS details page
 ADDED	authentication configuration option LOG_REMOTE_IP_HISTORY
-<<<<<<< HEAD
-=======
-ADDED   new icons for the new navigation
-ADDED   "Add new ..." on each overview page, to create new items
-
-CHANGED the whole navigation
-CHANGED the style of the title on all pages
-CHANGED advanced-actions box
->>>>>>> 48f56af... updated CHANGELOG
+CHANGED default behavor of multi-modify from "overwrite existing" to "add additional" (only for attributes that allow multiple values)
 
 Release 1.3.0 (2011-12-11)
 
diff --git a/handle_item.php b/handle_item.php
index 0e8d532..4888476 100644
--- a/handle_item.php
+++ b/handle_item.php
@@ -239,7 +239,7 @@
 			$replace_mode = 1;
 		}
 	}else{
-		$replace_mode = 1;
+		$replace_mode = 2;
 	}