=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java	2012-04-17 08:04:52 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java	2012-04-17 08:36:45 +0000
@@ -123,7 +123,7 @@
     {
         super.mergeWith( other );
 
-        if ( other.getClass().isInstance( other ) )
+        if ( other.getClass().isInstance( this ) )
         {
             OptionSet optionSet = (OptionSet) other;