Public search query: this pull request cannot be automatically merged: rebase conflict