Added correction for other entity merging