Fixed issues

Fixed some merging issues.
Unified date format

Unified the date format of both the dates.