diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py
index b7254f76..e389cd35 100644
--- a/pywb/rewrite/rewrite_content.py
+++ b/pywb/rewrite/rewrite_content.py
@@ -140,10 +140,6 @@ class RewriteContent:
 
                 return (status_headers, gen, False)
 
-            if wb_url.is_banner_only:
-                gen = self._head_insert_only_gen(head_insert_str, stream)
-                return (status_headers, gen, False)
-
             rewriter = rewriter_class(urlrewriter,
                                       js_rewriter_class=rule.rewriters['js'],
                                       css_rewriter_class=rule.rewriters['css'],
diff --git a/pywb/static/wb_frame.js b/pywb/static/wb_frame.js
index 1ec173c7..af1a66f2 100644
--- a/pywb/static/wb_frame.js
+++ b/pywb/static/wb_frame.js
@@ -89,6 +89,8 @@ function set_state(state) {
             label.innerHTML = _wb_js.labels.REPLAY_MSG;
         }
     }
+
+    curr_state = state;
 }
 
 window.onpopstate = function(event) {
diff --git a/setup.py b/setup.py
index a69a7c47..6b5482bf 100755
--- a/setup.py
+++ b/setup.py
@@ -34,11 +34,7 @@ class PyTest(TestCommand):
 
 setup(
     name='pywb',
-<<<<<<< HEAD
     version='0.6.0',
-=======
-    version='0.5.3',
->>>>>>> 0.5.4-fixes
     url='https://github.com/ikreymer/pywb',
     author='Ilya Kreymer',
     author_email='ikreymer@gmail.com',