more merging fixes