removed conflict data from blocks as it is not needed and not yet implemented

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "net.sergeych"
-version = "0.0.3-SNAPSHOT"
+version = "0.0.4-SNAPSHOT"
 
 repositories {
     mavenCentral()

src/commonMain/kotlin/net.sergeych.merge3/merge3.kt

@@ -60,14 +60,14 @@ sealed class MergedBlock<T> {
      */
     data class Resolved<T>(override val data: List<T>) : MergedBlock<T>()
 
-    /**
-     * The portion of data that can't be merged due to the conflicting changes.
-     * __Note it is not yet used.__
-     */
-    @Suppress("unused")
-    data class Conflict<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() {
-        override val data = variantA + variantB
-    }
+//    /**
+//     * The portion of data that can't be merged due to the conflicting changes.
+//     * __Note it is not yet used.__
+//     */
+//    @Suppress("unused")
+//    data class Conflict<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() {
+//        override val data = variantA + variantB
+//    }
 }