Date display stuff
merge conflict resolution