From 2c865a916403f67d708971c1888bfa7332dcce28 Mon Sep 17 00:00:00 2001
From: Stephan Traub <sbidy@hotmail.com>
Date: Mon, 21 Dec 2020 20:18:27 +0100
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index b89c8f6..2822c7e 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,9 @@
 # :bulb: wiz_light
 A Home assistant integration for (Phillips, SLV and more) WiZ Light bulbs. The Wiz Plug is also supported **currently in beta** as "switch" in HA.
 
-<<<<<<< HEAD
 ## :muscle: Change Log
-=======
-## Change Log
 **Testing/Contribution Required:** I released a beta of the new integration V0.1 --> check [Releases](https://github.com/sbidy/wiz_light/releases/tag/V0.1b)
 Please give feedback if any thing is missing or broaken. #50 is still open :wink:
->>>>>>> 074b82d5aacc4ac981fb859298652a6bf4406220
 
 Added a better handling of different bulb types. Introduced a YAML file with dynamic matchting.