diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
index a3d58dc847..5a2cdd12fc 100644
--- a/manifest-lock.overrides.yaml
+++ b/manifest-lock.overrides.yaml
@@ -9,7 +9,6 @@
 # for FCOS-specific packages (ignition, afterburn, etc.).
 
 packages:
-<<<<<<< HEAD
   coreos-installer:
     evr: 0.18.0-1.fc38
     metadata: