fixing conflicts

diff --cc moment.js
index 8651751c186b17a9efe7ea919489e9e73e06aa87,de24784044ff18111cbc6155683408c1e68f03eb..b52aed11d0246f3c3f82eaa28b969f4b66b07cbb
--- 1/moment.js
--- 2/moment.js
+++ b/moment.js
@@@ -1208,12 -1244,10 +1242,16 @@@
          return normalizeUnits(units);
      };
  
 +    moment.invalid = function () {
 +        var m = moment.utc(NaN);
 +        m._isValid = false;
 +        return m;
 +    };
 +
+     moment.parseZone = function (input) {
+         return moment(input).parseZone();
+     };
+ 
      /************************************
          Moment Prototype
      ************************************/

diff --cc test/moment/create.js
Simple merge