Implement proper orphan resolution during block insertion