merging in work from last night with work from this morning