diff --git a/src/IJulia/statedict.jl b/src/IJulia/statedict.jl
index d170c20..b0fe695 100644
--- a/src/IJulia/statedict.jl
+++ b/src/IJulia/statedict.jl
@@ -49,10 +49,7 @@ statedict{view, T}(d::Options{view, T}) =
          :tooltips=>d.tooltips,
          :readout => d.readout,
          :continuous_update=>d.continuous_update,
-<<<<<<< HEAD
          :orientation => d.orientation,
-=======
->>>>>>> Add continuous_update toggle for option widgets.
          :_options_labels=>collect(keys(d.options)))
 
 statedict(w::Widget) = begin