diff --git a/source/_integrations/voip.markdown b/source/_integrations/voip.markdown
index 5d6cdb8dfb9..fa3f706d8f4 100644
--- a/source/_integrations/voip.markdown
+++ b/source/_integrations/voip.markdown
@@ -12,11 +12,7 @@ ha_domain: voip
 ha_integration_type: integration
 ---
 
-<<<<<<< HEAD
-The VoIP integration enables users to talk to [Assist](/docs/assist) using an analog phone and a VoIP adapter such as the [Grandstream HT801](https://amzn.to/40k7mRa). See [the tutorial](/projects/worlds-most-private-voice-assistant) for detailed instructions.
-=======
 The VoIP integration enables users to talk to [Assist](/docs/assist) using an analog phone and a VoIP adapter such as the [Grandstream HT801](https://amzn.to/40k7mRa). See [the tutorial](/projects/worlds-most-private-voice-assistant/) for detailed instructions.
->>>>>>> d248f51168 (Fix tutorial link (#27173))
 
 <p class='img'>
   <img src="/images/integrations/voip/voip_adapter.png" />