diff --git a/source/_components/binary_sensor.mqtt.markdown b/source/_components/binary_sensor.mqtt.markdown
index 2961245dc45..d972e37862c 100644
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@@ -197,7 +197,3 @@ binary_sensor:
     payload_on: "1"
     payload_off: "0"
 ```
-<<<<<<< HEAD
-=======
-
->>>>>>> current