more merging conflicts resolved