Fix compilation errors

core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt

@@ -16,13 +16,7 @@
 
 package com.google.samples.apps.nowinandroid.core.network.demo
 
-<<<<<<<< HEAD:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt
 import com.google.samples.apps.nowinandroid.core.di.IODispatcher
-========
-import JvmUnitTestDemoAssetManager
-import com.google.samples.apps.nowinandroid.core.network.Dispatcher
-import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
->>>>>>>> upstream/main:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt
 import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource
 import com.google.samples.apps.nowinandroid.core.network.assets.NEWS_DATA
 import com.google.samples.apps.nowinandroid.core.network.assets.TOPICS_DATA
@@ -36,16 +30,9 @@ import me.tatarka.inject.annotations.Inject
 /**
  * [NiaNetworkDataSource] implementation that provides static news resources to aid development
  */
-<<<<<<<< HEAD:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt
-class FakeNiaNetworkDataSource @Inject constructor(
-    private val ioDispatcher: IODispatcher,
-    private val networkJson: Json,
-========
 class DemoNiaNetworkDataSource @Inject constructor(
-    @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
+    private val ioDispatcher: IODispatcher,
     private val networkJson: Json,
-    private val assets: DemoAssetManager = JvmUnitTestDemoAssetManager,
->>>>>>>> upstream/main:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt
 ) : NiaNetworkDataSource {
 
     override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =

core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt

@@ -17,11 +17,7 @@
 package com.google.samples.apps.nowinandroid.core.network.di
 
 import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource
-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
+import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSource
 
 internal interface FlavoredNetworkModule {
 

core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/FakeNiaNetworkDataSourceTest.kt

@@ -16,10 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.core.network.demo
 
-<<<<<<<< HEAD:core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt
-========
-import JvmUnitTestDemoAssetManager
->>>>>>>> upstream/main:core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.kt
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -43,10 +39,6 @@ class DemoNiaNetworkDataSourceTest {
         subject = DemoNiaNetworkDataSource(
             ioDispatcher = testDispatcher,
             networkJson = Json { ignoreUnknownKeys = true },
-<<<<<<<< HEAD:core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt
-========
-            assets = JvmUnitTestDemoAssetManager,
->>>>>>>> upstream/main:core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.kt
         )
     }