From 96a22aaec09e9e6470bf0ae3143f0d468ab1de11 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Fri, 30 Oct 2015 00:13:09 -0700
Subject: [PATCH] Make fp convert call `noConflict`.

---
 lib/fp/fp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fp/fp.js b/lib/fp/fp.js
index 80e0de1a7..3a01b53e2 100644
--- a/lib/fp/fp.js
+++ b/lib/fp/fp.js
@@ -12,7 +12,7 @@ var _ = require('lodash'),
  */
 function convert() {
   var args = arguments,
-      name = args.length ? args[0] : _.runInContext(),
+      name = args.length ? args[0] : _.noConflict().runInContext(),
       func = args[1];
 
   return base(util, name, func);