merging from joe