fixing more merges