Merge branch 'master' into hotfix-badge-name-fix

# Conflicts:
#	src/screens/suggestedPeople/SPBody.tsx

1 files changed, 1 insertions, 2 deletions

diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 91f41fe4..cb232297 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -4,11 +4,9 @@ import {StackNavigationOptions} from '@react-navigation/stack';
 import React, {useState} from 'react';
 import {StyleSheet, Text} from 'react-native';
 import {normalize} from 'react-native-elements';
-import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import BackIcon from '../../assets/icons/back-arrow.svg';
 import {
   AnimatedTutorial,
-  BadgeSelection,
   CaptionScreen,
   CategorySelection,
   CreateCustomCategory,
@@ -26,6 +24,7 @@ import {
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
 } from '../../screens';
+import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
 import {AvatarHeaderHeight, SCREEN_WIDTH} from '../../utils';
 import {MainStack, MainStackParams} from './MainStackNavigator';