performance optimization and bug fix
Relocate node in case of conflict