harmony/src/domain/interpret/mod.rs

@@ -62,11 +62,8 @@ impl std::fmt::Display for InterpretName {
             InterpretName::Lamp => f.write_str("LAMP"),
             InterpretName::ApplicationMonitoring => f.write_str("ApplicationMonitoring"),
             InterpretName::K8sPrometheusCrdAlerting => f.write_str("K8sPrometheusCrdAlerting"),
-<<<<<<< HEAD
             InterpretName::CephRemoveOsd => f.write_str("CephRemoveOsd"),
-=======
             InterpretName::DiscoverInventoryAgent => f.write_str("DiscoverInventoryAgent"),
->>>>>>> origin/master
             InterpretName::CephClusterHealth => f.write_str("CephClusterHealth"),
             InterpretName::Custom(name) => f.write_str(name),
             InterpretName::RHOBAlerting => f.write_str("RHOBAlerting"),