fix(app): merge conflict fix

lib/presentation/feed/feed_screen/feed_screen.dart

@@ -40,11 +40,11 @@ class FeedScreen extends StatelessWidget {
 
   _buildFeedScreen(BuildContext context, FeedLoadedState state) {
     mediaQueryData = MediaQuery.of(context);
-    return Scaffold(
-      backgroundColor: Colors.grey[200],
-      resizeToAvoidBottomInset: true,
-      body: SafeArea(
-        child: SingleChildScrollView(
+    return SafeArea(
+      child: Scaffold(
+        backgroundColor: Colors.grey[200],
+        resizeToAvoidBottomInset: true,
+        body: SingleChildScrollView(
           child: Container(
             width: double.maxFinite,
             decoration: BoxDecoration(color: Colors.grey[200]),
@@ -53,6 +53,7 @@ class FeedScreen extends StatelessWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
+                  SizedBox(height: 20),
                   _buildSearch(),
                   SizedBox(height: 20),
                   _buildMenu(context, state),
@@ -63,8 +64,8 @@ class FeedScreen extends StatelessWidget {
             ),
           ),
         ),
+        bottomNavigationBar: _buildBottomBar(context),
       ),
-      bottomNavigationBar: _buildBottomBar(context),
     );
   }