Search and calendar are connected

App.js

@@ -88,18 +88,12 @@ export default class App extends Component {
     return(
       <Provider store={store}>
         <NavigationContainer>
-<<<<<<< HEAD
-          <Drawer.Navigator>
-            <Drawer.Screen name={" "} options={{drawerLabel: "Home", headerTransparent: true}} children={this.createHomeStack}/>
-          </Drawer.Navigator>
-=======
           <Stack.Navigator initialRouteName="Home">
             <Stack.Screen name="Home" options={{headerTransparent: true, headerTitle: " "}} component={HomeScreen} />
             <Stack.Screen name="Calendar"  component={Calendario}/>
             <Stack.Screen name = "StateTime" component={Time}/>
             <Stack.Screen name = "Search" component={Search}/>
           </Stack.Navigator>
->>>>>>> 629a93ce3e1893879f58184298be77795abcf401
         </NavigationContainer>
       </Provider>