merge errors and a datetime fix