fixed merge conflicts
added datetime to the datamodel