Fixed more merging stuff