improve starting point for log date range
fix merge conflict