Fix find method
Resolve merge conflict