Fix big for null timestamp in formatter
fix merge conflict