Search: this branch has conflicts that must be resolved how to fix

Public search query: this branch has conflicts that must be resolved how to fix

Problem outcome: unknown