Merge proposals dependent on lp://staging/~jelmer/brz/gitlab-conflict

lp://staging/~jelmer/brz/gitlab-conflict has no merge proposals.