fixed merge problems

src/Pages/UserPage.js

@@ -23,7 +23,7 @@ import { Store } from '../Store.js';
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
 import Paper from '@material-ui/core/Paper';
-
+import ModalAlterarAvatar from '../Components/ModalAlterarAvatar/ModalAlterarAvatar'
 import TabPanelAtividades from '../Components/TabPanels/UserPageTabs/PanelAtividades.js'
 import TabPanelMeusRecursos from '../Components/TabPanels/UserPageTabs/PanelMeusRecursos.js'
 import TabPanelFavoritos from '../Components/TabPanels/UserPageTabs/PanelFavoritos.js'
@@ -81,7 +81,7 @@ export default function UserPage (props){
         })
         .then( (response) => {
             console.log(response)
-                
+
                 if((response.data.role_ids.includes(4))) {
                     setTabs([
                         'Atividades', 'Status e Conquistas', 'Meus Recursos', 'Favoritos', 'Coleções', 'Rede', 'Curadoria'
@@ -98,6 +98,8 @@ export default function UserPage (props){
         props.history.push('/')
     }
 
+    const [modalOpen, toggleModal] = useState(false)
+
     return (
         <>
         <link href="https://fonts.googleapis.com/css?family=Roboto:100,400,500&display=swap" rel="stylesheet"/>
@@ -108,7 +110,7 @@ export default function UserPage (props){
                     <React.Fragment>
                         <ModalAlterarAvatar
                             open={modalOpen}
-                            handleClose={modalControl}
+                            handleClose={() => {toggleModal(false)}}
                             userAvatar={state.currentUser.userAvatar}
                         />