diff --git a/homeassistant/const.py b/homeassistant/const.py
index 0789531e9a3..1a29b36cb4d 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -3,6 +3,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 36
 PATCH_VERSION = '0.dev0'
+>>>>>>> master
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 4, 2)