fixed spawn conflict resolution bug; clarified resolution code