Fix cmerge conflicts

Signed-off-by: Steve Scargall <37674041+sscargal@users.noreply.github.com>

Author: sscargal

content/en/testimonials/Teamate.md

@@ -2,14 +2,10 @@
 title: "Amazing Results with MemMachine"
 date: 2025-11-10T17:40:16-06:00
 author: "CEO"
-<<<<<<< HEAD:content/en/testimonials/TeamMate.md
-company: "TeamMate"
-=======
 company: "Teamate"
->>>>>>> 76d64ad (Fix typo in compan name; TeamMate -> Teammate):content/en/testimonials/Teamate.md
 company_url: "https://teamate.app/"
 logo: "https://www.teamate.app/_next/image?url=%2Fimages%2Fteamate.png&w=48&q=75"
 draft: false
 ---
 
-"Teamate leverages MemMachine's advanced memory infrastructure—combining vector databases, graph-based entity and temporal relationships—to power our proactive AI assistant that transforms team collaboration. It allows Teamate to deliver intelligent, context-aware insights that improve with every conversation and automate manual tasks for our customers. We are delighted to see the efficiency boost MemVerge gets by using Teamate internally, and we are excited about the journey ahead to build the best Team-AI collaboration experience powered by the best open-source memory solution in the world."
+"Teamate leverages MemMachine's advanced memory infrastructure—combining vector databases, graph-based entity and temporal relationships—to power our proactive AI assistant that transforms team collaboration. It allows Teamate to deliver intelligent, context-aware insights that improve with every conversation and automate manual tasks for our customers. We are delighted to see the efficiency boost MemVerge gets by using Teamate internally, and we are excited about the journey ahead to build the best Team-AI collaboration experience powered by the best open-source memory solution in the world."