Fix conflict

c3.js

@@ -1563,6 +1563,9 @@
             for (i = 1; i < rows.length; i++) {
                 new_row = {};
                 for (j = 0; j < rows[i].length; j++) {
+                    if (isUndefined(rows[i][j])) {
+                        throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
+                    }
                     new_row[keys[j]] = rows[i][j];
                 }
                 new_rows.push(new_row);
@@ -1577,6 +1580,9 @@
                     if (isUndefined(new_rows[j - 1])) {
                         new_rows[j - 1] = {};
                     }
+                    if (isUndefined(columns[i][j])) {
+                        throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
+                    }
                     new_rows[j - 1][key] = columns[i][j];
                 }
             }