Fixed dates.
Fixed merge conflicts.