diff --git a/source/components/index.markdown b/source/components/index.markdown
index fc92a0e1041..dd3492a4ae1 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -226,7 +226,6 @@ the manufacturers of these devices.
 <td><img src='/images/supported_brands/openweathermap.png' class='brand' /></td>
 <td><a href='/components/sensor.openweathermap.html'>OpenWeatherMap</a></td>
 <td>Display current meteorological data from your location.</td>
-<<<<<<< HEAD
 </tr>
 
 <tr>