diff --git a/.coveragerc b/.coveragerc
index 662d880af1b..1cf32519adb 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -235,15 +235,12 @@ omit =
     homeassistant/components/harmony/remote.py
     homeassistant/components/haveibeenpwned/sensor.py
     homeassistant/components/hdmi_cec/*
-<<<<<<< HEAD
     homeassistant/components/heatmiser/climate.py
     homeassistant/components/hikvision/binary_sensor.py
     homeassistant/components/hikvisioncam/switch.py
     homeassistant/components/hipchat/notify.py
     homeassistant/components/hitron_coda/device_tracker.py
-=======
     homeassistant/components/heos/*
->>>>>>> Update HEOS to support multiple speaker and conformance.
     homeassistant/components/hive/*
     homeassistant/components/hlk_sw16/*
     homeassistant/components/homekit_controller/*