diff --git a/src/lib/campaignQuickActionDemands.ts b/src/lib/campaignQuickActionDemands.ts
index bd76e246..bd53d1e4 100644
--- a/src/lib/campaignQuickActionDemands.ts
+++ b/src/lib/campaignQuickActionDemands.ts
@@ -4,9 +4,9 @@ import {
   type CampaignWizardActionId,
 } from '@/lib/campaignActionRoutes'
 import { homeActionsForRole } from '@/lib/campaignHomeActions'
-import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_DEMANDS_HOME } from '@/lib/campaignPaths'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
+import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { isStaffCampaignRole, type CampaignRole } from '@/lib/campaignRoles'
 
 export const CAMPAIGN_DEMANDS_CREATE_HREF = `${CAMPAIGN_DEMANDS_HOME}/nova` as const
diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index dd55625b..c8fad4c3 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,25 +1,12 @@
-<<<<<<< HEAD
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
-=======
-import {
-  resolveStaffHomeQuickActions,
-  type ResolvedCampaignHomeAction,
-} from '@/lib/campaignHomeActions'
-<<<<<<< HEAD
->>>>>>> 72d8fe2 (style: Prettier (B85))
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
-=======
-import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
-import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
->>>>>>> 46c797f (style: Prettier (B85))
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
-<<<<<<< HEAD
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
@@ -27,8 +14,6 @@ import {
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
-=======
->>>>>>> 72d8fe2 (style: Prettier (B85))
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
@@ -50,17 +35,16 @@ export const resolveQuickActionsForPath = (
     return resolveActivityQuickActions(activitySurface, role, context)
   }
 
-<<<<<<< HEAD
   const organizationSurface = parseOrganizationQuickActionSurface(pathname)
   if (organizationSurface) {
     return resolveOrganizationQuickActions(organizationSurface, role, context)
-=======
+  }
+
   if (isDemandsListPath(pathname)) {
     return resolveDemandsListQuickActions(role)
   }
   if (isDemandDetailPath(pathname)) {
     return resolveDemandDetailQuickActions(role, context)
->>>>>>> 2417ed3 (B85 — Ações rápidas no drawer de Demandas (lista + detalhe))
   }
 
   const municipalityActions = resolveMunicipalityQuickActionsForPath(pathname, role, context)