fixed some more merging stuff ... sight