--- a/MCMerger.st	Sat Aug 20 13:44:44 2011 +0200
+++ b/MCMerger.st	Sat Aug 20 13:44:49 2011 +0200
@@ -20,7 +20,7 @@
 !
 
 conflicts
-	^ conflicts ifNil: [conflicts _ OrderedCollection new]
+	^ conflicts ifNil: [conflicts := OrderedCollection new]
 !
 
 isMerged
@@ -29,7 +29,7 @@
 
 load
 	| loader |
-	loader _ MCPackageLoader new.
+	loader := MCPackageLoader new.
 	loader provisions addAll: self provisions.
 	self applyTo: loader.
 	loader load
@@ -37,7 +37,7 @@
 
 loadWithNameLike: baseName
 	| loader |
-	loader _ MCPackageLoader new.
+	loader := MCPackageLoader new.
 	loader provisions addAll: self provisions.
 	self applyTo: loader.
 	loader loadWithNameLike: baseName
@@ -58,5 +58,13 @@
 !MCMerger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMerger.st,v 1.1 2006-11-22 13:08:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMerger.st,v 1.2 2011-08-20 11:44:49 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMerger.st,v 1.2 2011-08-20 11:44:49 cg Exp $'
+!
+
+version_SVN
+    ^ '§Id: MCMerger.st 5 2010-08-29 07:30:29Z vranyj1 §'
 ! !