diff --git a/components/index.html b/components/index.html
index bf5946fe21..2f94a8f6f8 100644
--- a/components/index.html
+++ b/components/index.html
@@ -341,15 +341,12 @@ 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>
 <td><img src='/images/supported_brands/bitcoin.png' class='brand' /></td>
 <td><a href='/components/sensor.bitcoin.html'>Bitcoin</a></td>
 <td>Display details about the Bitcoin Network and your Blockchain.info online wallet.</td>
-=======
->>>>>>> f9261e70a652b2bcd1f852f2cdc93ad21184e594
 </tr>
 
 <tr>
@@ -463,4 +460,4 @@ the service providers.
 
 
   </body>
-</html>
\ No newline at end of file
+</html>