Some more merges