Search - "one way to avoid merge conflicts"