fix some more mergeuser issues [#470]