diff --git a/IPython/html/static/notebook/js/widgets/base.js b/IPython/html/static/notebook/js/widgets/base.js
index a776caa92..bd3f88a15 100644
--- a/IPython/html/static/notebook/js/widgets/base.js
+++ b/IPython/html/static/notebook/js/widgets/base.js
@@ -183,8 +183,12 @@ function(widget_manager, underscore, backbone){
             // triggered on model change
         },
 
+<<<<<<< HEAD
 <<<<<<< HEAD
         child_view: function(model_id, view_name) {
+=======
+        child_view: function(model_id, view_name, options) {
+>>>>>>> s/comm_id/model_id (left over from before)
             // create and return a child view, given a comm id for a model and (optionally) a view name
             // if the view name is not given, it defaults to the model's default view attribute
             var child_model = this.widget_manager.get_model(model_id);