diff --git a/src/App.js b/src/App.js
index 922949aabf04035784062be84401ebf639ab1728..c2d92119c3d8d2d67b7838c676b7de52a8c7dec0 100644
--- a/src/App.js
+++ b/src/App.js
@@ -70,12 +70,10 @@ export default function App(){
         <Route path="/busca" component={Search} />
         <Route path="/usuario" component={UserPage} />
         <Route path="/recurso" component={ResourcePage}/>
-<<<<<<< HEAD
-      	<Route path="/termos" component={UserTerms}/>
-=======
+
       	<Route path="/termos" component={UserTerms}/>
         <Route path="/teste" component={Teste}/>
->>>>>>> 3ddcc71da0ad68662cfa886d12da8bc55c9a69b2
+
       </Switch>
       <EcFooter/>
       <GNUAGPLfooter/>
diff --git a/src/Components/ResourceCard.js b/src/Components/ResourceCard.js
index a5eb7c12bbb915aa9218cfff94708fba2e345790..a5987b008e4567c001cbecf34068f95459b248c0 100644
--- a/src/Components/ResourceCard.js
+++ b/src/Components/ResourceCard.js
@@ -48,7 +48,7 @@ import Video from '@material-ui/icons/OndemandVideo';
 import noAvatar from "../img/default_profile.png";
 
 const types = [{label: "Animação", thumb: animacao}, {label: "Apresentação", thumb: apresentacao},
-{label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}]
+{label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro digital", thumb: livro}, {label: "Livro", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}]
 const slideStyle={
   height: "50px",
   width: "50px",