more merging that i missed