Merging from Guffi