beginning of day
fix conflict