Return location on search
Resolve merge conflicts