Fix determining if there is property conflict

Author: trilis

model-lowerings-common/src/org/jetbrains/dukat/model/commonLowerings/overrides/VarConflictResolveLowering.kt

@@ -42,10 +42,18 @@ private class VarOverrideResolver(
     ): List<List<MemberData>> {
         return parentMembers.keys.mapNotNull { name ->
             val properties = parentMembers[name].orEmpty().filter { it.memberModel is PropertyModel }
-            if (properties.isEmpty() || cartesian(properties, properties).all { (first, second) ->
+
+            val propertiesInImmediateParents = properties.filter { first ->
+                properties.none { second ->
+                    inheritanceContext.isDescendant(second.ownerModel, first.ownerModel)
+                }
+            }
+            
+            // if all properties in immediate parents have equivalent type, then there is no conflict
+            if (propertiesInImmediateParents.isEmpty() || propertiesInImmediateParents.all { property ->
                     with(typeChecker) {
-                        (first.memberModel as PropertyModel).type.isEquivalent((second.memberModel as PropertyModel).type)
-                    } || inheritanceContext.areRelated(first.ownerModel, second.ownerModel)
+                        (property.memberModel as PropertyModel).type.isEquivalent((properties[0].memberModel as PropertyModel).type)
+                    }
                 }) {
                 null
             } else {