more merging added