Fixing merge conflict

.gitignore

+node_modules
\ No newline at end of file

.jshintrc

+{
+    "jquery": true,
+    "browser": true,
+
+    "bitwise":false,
+    "curly": true,
+    "eqnull": true,
+    "globalstrict": true,
+    "devel": true,
+    "eqeqeq": true,
+    "forin": false,
+    "immed": true,
+    "supernew": true,
+    "expr": true,
+    "indent": 2,
+    "latedef": true,
+    "newcap": true,
+    "noarg": true,
+    "noempty": true,
+    "undef": true,
+    "boss": true,
+    "trailing": false,
+    "laxbreak": true,
+    "laxcomma": true,
+    "sub": true,
+
+    "maxlen": 140,
+
+    "globals": {
+      "$LAB": false,
+      "_": false,
+      "$": false,
+      "kbn" : false,
+      "angular" : false,
+      "exports": true,
+      "module": false,
+      "config": false,
+      "moment": false
+    }
+}
\ No newline at end of file

Gruntfile.js

@@ -17,34 +17,7 @@ module.exports = function (grunt) {
     jshint: {
       files: ['Gruntfile.js', 'js/*.js', 'panels/*/*.js' ],
       options: {
-        bitwise: true,
-        maxlen: 140,
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        indent: 2,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        globalstrict: true,
-        devel: true,
-        node: true,
-        globals: {
-          '$LAB': false,
-          '_': false,
-          '$': false,
-          'kbn' : false,
-          window: false,
-          document: false,
-          exports: true,
-          module: false,
-          config: false,
-          moment: false
-        }
+        jshintrc: '.jshintrc'
       }
     },
     less: {

panels/histogram/module.js

@@ -392,9 +392,9 @@ angular.module('kibana.histogram', [])
             // so that the stacking happens in the proper order
             var required_times = [];
             if (scope.panel.bars && stack) {
-              required_times = Array.prototype.concat.apply([], _.map(scope.data, function (series) {
-                return series.time_series.getOrderedTimes();
-              }));
+              required_times = _.uniq(Array.prototype.concat.apply([], _.map(scope.data, function (query) {
+                return query.time_series.getOrderedTimes();
+              })).sort(), true);
             }
 
             for (var i = 0; i < scope.data.length; i++) {
@@ -532,11 +532,11 @@ angular.module('kibana.histogram', [])
    * @return {array} An array of integer times.
    */
   this.ZeroFilled.prototype.getOrderedTimes = function (include) {
-    var times = _.map(_.keys(this._data), base10Int).sort();
+    var times = _.map(_.keys(this._data), base10Int);
     if (_.isArray(include)) {
       times = times.concat(include);
     }
-    return times;
+    return _.uniq(times.sort(), true);
   };
 
   /**