beginning of day
fixing conflicts