ENH: date merge

Fixes to datetime and fixed multiline at the same time.

Not 100% sure of this yet.