Merge develop and fix conflict

1 files changed, 3 insertions, 3 deletions

diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 5e204001..a56a27ea 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -1,12 +1,12 @@
 import apiService from '../../services/api/api.service.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import _ from 'lodash'
+import { shuffle } from 'lodash'
 
 function showWhoToFollow (panel, reply) {
-  _.shuffle(reply)
+  const shuffled = shuffle(reply)
 
   panel.usersToFollow.forEach((toFollow, index) => {
-    let user = reply[index]
+    let user = shuffled[index]
     let img = user.avatar || '/images/avi.png'
     let name = user.acct