update for merges

just a few today...