New things added
Date added
Time added
Conflict resolved with snarra
Date conflict resolved with snarra