remove(theirs.getType());
base.setName(null);
// hack: fix content type if it was lost
if (mine.getContentType() == null && base.getContentType() == null) {
VltEntryInfo workInfo = work();
if (workInfo.getContentType() == null) {
workInfo.setContentType(MimeTypes.getMimeType(work.getName()));
}
base.setContentType(workInfo.getContentType());
}
return true;
}