fix conflicting days, add check for no time info