diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index bbec8ee3a..aa590d5b2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - added the optional WebGUI::Content::PDFGenerator, not enabled by default
    (see the module's documentation).
  - fixed #12204: Default forum notification template produces invalid HTML
+ - fixed #12202: JsonTable refers to unexistent YUI file
 
 7.10.20
  - fixed: Do not call group methods on an undefined value.
diff --git a/lib/WebGUI/Form/JsonTable.pm b/lib/WebGUI/Form/JsonTable.pm
index 9e8403906..84b0d6d5b 100644
--- a/lib/WebGUI/Form/JsonTable.pm
+++ b/lib/WebGUI/Form/JsonTable.pm
@@ -229,6 +229,27 @@ sub toHtml {
     $output .= '<input type="hidden" name="' . $self->get('name') . '" value="' . $value . '" />';
 
     # Existing rows are entirely built in javascript from the JSON in the hidden field
+<<<<<<< HEAD
+=======
+    $style->setScript(
+        $url->extras('yui/build/connection/connection-min.js'),
+        { type => 'text/javascript' },
+    );
+    $style->setScript(
+        $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),
+        { type => 'text/javascript' },
+    );
+    $style->setScript(
+        $url->extras('yui/build/json/json-min.js'),
+        { type => 'text/javascript' },
+    );
+    $style->setScript(
+        $url->extras('yui-webgui/build/i18n/i18n.js'),
+        { type => 'text/javascript' },
+    );
+    $output .= sprintf '<script src="%s" type="text/javascript"></script>', 
+                $url->extras('yui-webgui/build/form/jsontable.js');
+>>>>>>> 7d20406... Fix a bad script link in the JsonTable.  Fixes bug #12202.
     $output .= '<script type="text/javascript">'
             . q{new WebGUI.Form.JsonTable("} . $self->get('name') . q{","} . $self->get( 'id' ) . q{", }
             . JSON->new->encode( $self->get('fields') ) . q{ );}