Fixed merge conflict

lib/defaults/index.js

@@ -2,7 +2,7 @@
 
 var utils = require('../utils');
 var normalizeHeaderName = require('../helpers/normalizeHeaderName');
-var enhanceError = require('../core/enhanceError');
+var AxiosError = require('../core/AxiosError');
 var transitionalDefaults = require('./transitional');
 
 var DEFAULT_CONTENT_TYPE = {
@@ -87,7 +87,7 @@ var defaults = {
       } catch (e) {
         if (strictJSONParsing) {
           if (e.name === 'SyntaxError') {
-            throw enhanceError(e, this, 'E_JSON_PARSE');
+            throw AxiosError.from(e, AxiosError.ERR_BAD_RESPONSE, this, null, this.response);
           }
           throw e;
         }