diff --git a/tests/int/homeSearchMunicipalities.int.spec.ts b/tests/int/homeSearchMunicipalities.int.spec.ts
index 5ad556fa..01c7e9e0 100644
--- a/tests/int/homeSearchMunicipalities.int.spec.ts
+++ b/tests/int/homeSearchMunicipalities.int.spec.ts
@@ -52,13 +52,8 @@ describe('searchHomeMunicipalities (B48)', () => {
     const other = await fixtures.getMunicipality('feira-de-santana')
     await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
 
-<<<<<<< HEAD
     const otherQuery = distinctWordStartQuery(other.name, administered.name)
     const administeredQuery = distinctWordStartQuery(administered.name, other.name)
-=======
-    const otherQuery = 'Feira'
-    const administeredQuery = 'Cairu'
->>>>>>> 798c289 (test: pin home search municipality scope fixtures to distinct slugs)
 
     const advisorResult = await searchHomeMunicipalities(payload, advisor, otherQuery)
     expect(advisorResult.municipalities.map((hit) => hit.slug)).toEqual([])