diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 3ad2eac8d..a552d9a5f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -70,11 +70,7 @@
             <p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
-<<<<<<< HEAD
-          <div (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card d-md-flex d-none flex-column justify-center white-background">
-=======
           <div (click)="openExpedientesPrPage(); selectedElement = 'Expediente Presidente'" [class.active]="selectedElement == 'Expediente Presidente'" class="exp-card d-md-flex d-none flex-column justify-center white-background">
->>>>>>> bb49078bfced9a3cf3d4e7d5af6a60ec6e10164f
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
             </div>
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 6fc4ff9d6..b25875247 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -76,26 +76,6 @@ segmentChanged(ev: any) {
 
  async LoadList() {
 
-<<<<<<< HEAD
-   let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-   
-   console.log(result);
-
-   await result.forEach( (element, index) => {
-     let task = {
-       "SerialNumber": element.serialNumber,
-       "Folio": element.workflowInstanceDataFields.Subject,
-       "Senders": element.workflowInstanceDataFields.Sender,
-       "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-       "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-       "Remetente": element.workflowInstanceDataFields.Remetente,
-       "DocumentsQty": '',
-       "DocId": element.workflowInstanceDataFields.DocId,
-       "WorkflowName": element.workflowDisplayName,
-       "FolderID": element.workflowInstanceDataFields.FolderID
-     }
-     this.despachoList.push(task)
-=======
   this.despachoList = new Array();
 
   this.loading = true;
@@ -105,7 +85,6 @@ segmentChanged(ev: any) {
   console.log(result);
   
   result.forEach( (element, index) => {
->>>>>>> bb49078bfced9a3cf3d4e7d5af6a60ec6e10164f
      
     let task = {
       "SerialNumber": element.serialNumber,