bugfixes in mergeimport