I can see the merge conflicts. I need to resolve them by keeping both sets of posts - the new ones from main (observation-research-plan and financial-agentic-ai) and the ones from HEAD (middle, april, may). Let me fix both files:

Now let me fix the research/[slug]/page.tsx file. I need to read the full file to understand the conflicts better:

Now I need to fix the conflicts in the research/[slug]/page.tsx file. Let me fix them one by one:

Now let me commit the merge:

I pulled the latest changes from v0/nicolecsy04-3537-2521d03c in v0-portfolio.