Resolved conflicts when merging HEAD.

src/mtime_timedelta.c

@@ -556,6 +556,7 @@ localTimeDeltaToJulianDelta_StandardTimeDelta_CalTypeGREGORIAN(struct _timedelta
 	    }
 
 	  /* Fast-Fwd >= 400 */
+
 	  int64_t numberOf400YearPeriods = td->year / 400;
 	  int64_t i =  base_dt->date.year + numberOf400YearPeriods * 400;
 	  jd_return->day = jd_return->day + numberOf400YearPeriods * NO_OF_DAYS_IN_400_YEARS;
@@ -622,8 +623,8 @@ localTimeDeltaToJulianDelta_StandardTimeDelta_CalTypeGREGORIAN(struct _timedelta
 	  /* Fast-Fwd >= 400 */
 	  int64_t numberOf400YearPeriods = td->year / 400;
 	  int64_t i =  base_dt->date.year - numberOf400YearPeriods * 400;
-	  jd_return->day = jd_return->day - numberOf400YearPeriods * NO_OF_DAYS_IN_400_YEARS;
 
+	  jd_return->day = jd_return->day - numberOf400YearPeriods * NO_OF_DAYS_IN_400_YEARS;
 
 	  /* The year from (target date + 399) to base_date - delta years + 1 */
 	  for (; i > base_dt->date.year - td->year; i--)