more merging after rework