fixed more merging issues