fix datetime issue
fix merge conflicts