diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
index 9c8fc8b520a..1bac96bf672 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
@@ -432,7 +432,6 @@ public void testYearMonthDay() {
     }
 
     @Test
-<<<<<<< Upstream, based on origin/main
     public void testColorTemperatureAliases() {
         QuantityType<?> value;
         value = QuantityType.valueOf("20 mired");
@@ -441,7 +440,8 @@ public void testColorTemperatureAliases() {
         assertEquals(Units.MIRED, value.getUnit());
         value = QuantityType.valueOf("20 MK⁻¹");
         assertEquals(Units.MIRED, value.getUnit());
-=======
+    }
+
     public void testGrains() {
         assertThat(ImperialUnits.GRAIN.getSymbol(), is("gr"));
         QuantityType<?> oneHundredGrains = QuantityType.valueOf("100 gr");
@@ -458,7 +458,6 @@ public void testArealDensity() {
         QuantityType<?> newspaper = QuantityType.valueOf("72 g/m²");
         QuantityType<?> converted = newspaper.toUnit(Units.KILOGRAM_PER_SQUARE_METRE);
         assertEquals(converted.doubleValue(), 0.072);
->>>>>>> df0bd5e Adding some units requested in open issues
     }
 
     private static class QuantityEquals extends IsEqual<Quantity<?>> {