diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 66edc9c60..4ddebb1de 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -27,13 +27,8 @@
          <ion-tab-button tab="search">
           <ion-icon name="search"></ion-icon>
           <ion-label>Pesquisa</ion-label>
-<<<<<<< HEAD
-        </ion-tab-button> -->
-        <ion-tab-button hidden tab="chat">
-=======
         </ion-tab-button>
-        <!-- <ion-tab-button tab="chat">
->>>>>>> feature/home
+        <ion-tab-button tab="chat">
           <ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
           <ion-label>Chat</ion-label>
         </ion-tab-button>