Search results for diff merge conflicts