.

Author: TooTallNate

docs/content/docs/deploying/world/vercel-world.mdx

@@ -221,11 +221,7 @@ If workflows don't work after deployment:
 1. Verify `withWorkflow()` is wrapping your Next.js config
 2. Check build logs for errors
 3. Ensure workflow files are in the correct directory
-<<<<<<< HEAD
 4. Test locally first with [Local World](/docs/deploying/world/local-world)
-=======
-4. Test locally first with [Embedded World](/docs/deploying/world/local-world)
->>>>>>> d86cb1aab44a45cfd54466847cf04409c0d90367
 
 ## Learn More