Fix no method error
Return false of ancestry is nil for has_parent?
Fix merging conflicts