Fix MrSwitch#18

Author: MrSwitch

src/utils/merge.js

@@ -10,15 +10,15 @@ module.exports = function merge(a, b) {
 
 	if (typeof(a) === 'object' && typeof(b) === 'object') {
 		for (x in a) {
-			if (a.hasOwnProperty(x)) {
+			if (Object.prototype.hasOwnProperty.call(a, x)) {
 				r[x] = a[x];
 				if (x in b) {
 					r[x] = merge(a[x], b[x]);
 				}
 			}
 		}
 		for (x in b) {
-			if (b.hasOwnProperty(x)) {
+			if (Object.prototype.hasOwnProperty.call(b, x)) {
 				if (!(x in a)) {
 					r[x] = b[x];
 				}