diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index dad07c87cb6..b2f50148bd3 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20180326.0']
+REQUIREMENTS = ['home-assistant-frontend==20180330.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log']
diff --git a/homeassistant/const.py b/homeassistant/const.py
index d286aa85458..0ac3899cba6 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,8 +1,13 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
+<<<<<<< HEAD
 MINOR_VERSION = 67
 PATCH_VERSION = '0.dev0'
+=======
+MINOR_VERSION = 66
+PATCH_VERSION = '0b3'
+>>>>>>> origin/rc
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)
diff --git a/requirements_all.txt b/requirements_all.txt
index 8c355606194..e79249151b1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -366,7 +366,7 @@ hipnotify==1.0.8
 holidays==0.9.4
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180326.0
+home-assistant-frontend==20180330.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.8
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 185f1fff81b..e8a57488d80 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -81,7 +81,7 @@ hbmqtt==0.9.1
 holidays==0.9.4
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180326.0
+home-assistant-frontend==20180330.0
 
 # homeassistant.components.influxdb
 # homeassistant.components.sensor.influxdb