merged yesterdays work