Search - "merge conflicts are painful"