From 9d7165fcb19b1116a293317c059b01f771cd4876 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 1 Feb 2018 17:23:48 -0500
Subject: [PATCH] Fix merge conflicts

---
 src/librustc/traits/select.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index e03f3e7f12c2..5921869949ec 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -454,7 +454,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
             freshener: infcx.freshener(),
             intercrate: None,
             inferred_obligations: SnapshotVec::new(),
-            intercrate_ambiguity_causes: Vec::new(),
+            intercrate_ambiguity_causes: None,
             allow_negative_impls
         }
     }