diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala b/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala
index bffc9845..bd42f274 100644
--- a/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala
+++ b/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigDelayedMergeObject.scala
@@ -206,12 +206,8 @@ final class ConfigDelayedMergeObject(
             throw new ConfigException.BugOrBroken(
               "should not be reached: unmergeable object returned null value"
             )
-<<<<<<< HEAD
-          } else { // a non-unmergeable AbstractConfigObject that returned null
-=======
           } else {
             // a non-unmergeable AbstractConfigObject that returned null
->>>>>>> Upgrade scalafmt
             // for the key in question is not relevant, we can keep
             // looking for a value.
             break // continue
diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala b/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala
index 47d45f9d..cc301b5b 100644
--- a/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala
+++ b/sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala
@@ -185,10 +185,7 @@ object ConfigImpl {
         origin,
         ju.Collections.emptyList[AbstractConfigValue]
       )
-  <<<<<<< HEAD
-    =======
 
-  >>>>>>> Upgrade scalafmt
   private def emptyObject(origin: ConfigOrigin): AbstractConfigObject = {
     // we want null origin to go to SimpleConfigObject.empty() to get the
     // origin "empty config" rather than "hardcoded value"
@@ -204,10 +201,7 @@ object ConfigImpl {
     val origin = valueOrigin(originDescription)
     fromAnyRef(obj, origin, FromMapMode.KEYS_ARE_KEYS)
   }
-  <<<<<<< HEAD
-    =======
 
-  >>>>>>> Upgrade scalafmt
   def fromPathMap(
       pathMap: ju.Map[String, _],
       originDescription: String