more merging -_-