diff --git a/IPython/html/static/notebook/js/widgets/base.js b/IPython/html/static/notebook/js/widgets/base.js
index a776caa..bd3f88a 100644
--- a/IPython/html/static/notebook/js/widgets/base.js
+++ b/IPython/html/static/notebook/js/widgets/base.js
@@ -184,7 +184,11 @@ function(widget_manager, underscore, backbone){
},
<<<<<<< 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);