Fixed date stuff
Merge conflict stuff