Fix null timestamp not being handled
fix merge conflict