turned dates into datetime objects
fixed the merge conflict