some more merges