fixed more merges