fix merge conflicts

.github/workflows/ci.yml

@@ -352,8 +352,7 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Setup SSH Client 🔑
-      if: (github.event_name == 'release' || github.event_name == 'push') && github.ref == 'refs/heads/master'
-      uses: webfactory/ssh-agent@v0.2.0
+      uses: webfactory/ssh-agent@v0.4.1
       with:
         ssh-private-key: ${{ secrets.DOCS_DEPLOY_KEY }}
 

README.md

@@ -8,7 +8,7 @@
 </div>
 <p align="center">
     <a href="https://github.com/allenai/allennlp/actions">
-        <img alt="Build" src="https://github.com/allenai/allennlp/workflows/Master/badge.svg?event=push&branch=master">
+        <img alt="CI" src="https://github.com/allenai/allennlp/workflows/CI/badge.svg?event=push&branch=master">
     </a>
     <a href="https://pypi.org/project/allennlp/">
         <img alt="PyPI" src="https://img.shields.io/pypi/v/allennlp">

tests/training/metrics/auc_test.py

@@ -100,6 +100,7 @@ def test_distributed_auc(self):
         labels = torch.randint(3, 5, (8,), dtype=torch.long)
         # We make sure that the positive label is always present.
         labels[0] = 4
+        labels[4] = 4
 
         false_positive_rates, true_positive_rates, _ = metrics.roc_curve(
             labels.cpu().numpy(), predictions.cpu().numpy(), pos_label=4
@@ -124,6 +125,7 @@ def test_distributed_auc_unequal_batches(self):
         labels = torch.randint(3, 5, (8,), dtype=torch.long)
         # We make sure that the positive label is always present.
         labels[0] = 4
+        labels[4] = 4
 
         false_positive_rates, true_positive_rates, _ = metrics.roc_curve(
             labels.cpu().numpy(), predictions.cpu().numpy(), pos_label=4