Prevent following entities to be considered as one.
Added correction for other entity merging
Restore
Prevent replacing many entities by one
Merge pull request #147 from crystalin/master

Prevent following entities to be considered as one.