[PATCH] memory hotadd fixes: enhance collision check