Get rid of Distance field from pick results.
Resolve merge conflict.