update for today's merges