From 0f6f38e66b211474dc2122f2021579a03a4cb6ae Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Sat, 8 Apr 2023 14:22:51 -0700
Subject: [PATCH] Resolve merge conflicts in chisel3.5.6 bump

---
 generators/chipyard/src/main/scala/ConfigFinder.scala          | 2 +-
 generators/chipyard/src/main/scala/example/CustomChipTop.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/chipyard/src/main/scala/ConfigFinder.scala b/generators/chipyard/src/main/scala/ConfigFinder.scala
index 1c83c3d12f..dfee340d08 100644
--- a/generators/chipyard/src/main/scala/ConfigFinder.scala
+++ b/generators/chipyard/src/main/scala/ConfigFinder.scala
@@ -5,7 +5,7 @@ import org.reflections.scanners.Scanners.SubTypes
 import scala.jdk.CollectionConverters._
 import scala.collection.{SortedSet}
 
-import freechips.rocketchip.config.{Config}
+import org.chipsalliance.cde.config.{Config}
 
 object ConfigFinder {
     def main(args: Array[String]) = {
diff --git a/generators/chipyard/src/main/scala/example/CustomChipTop.scala b/generators/chipyard/src/main/scala/example/CustomChipTop.scala
index 19be7d5bd4..19ec945b4f 100644
--- a/generators/chipyard/src/main/scala/example/CustomChipTop.scala
+++ b/generators/chipyard/src/main/scala/example/CustomChipTop.scala
@@ -3,7 +3,7 @@ package chipyard.example
 import chisel3._
 import chipyard.iobinders._
 
-import freechips.rocketchip.config._
+import org.chipsalliance.cde.config._
 import freechips.rocketchip.diplomacy.{InModuleBody}
 import barstools.iocell.chisel._
 import chipyard._