implement Date Difference
fix merge