diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index 134929b76e9..d76956de5bd 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -94,19 +94,16 @@ DISCOVERY_COMPONENTS = [
      [COMMAND_CLASS_THERMOSTAT_SETPOINT],
      TYPE_WHATEVER,
      GENRE_WHATEVER),
-<<<<<<< HEAD
     ('hvac',
      DISCOVER_HVAC,
      [COMMAND_CLASS_THERMOSTAT_FAN_MODE],
      TYPE_WHATEVER,
      GENRE_WHATEVER),
-=======
     ('lock',
      DISCOVER_LOCKS,
      [COMMAND_CLASS_DOOR_LOCK],
      TYPE_BOOL,
      GENRE_USER),
->>>>>>> pr/1969
 ]