> ## Documentation Index > Fetch the complete documentation index at: https://www.getmaxim.ai/docs/llms.txt > Use this file to discover all available pages before exploring further. # Collaborative Conflict Resolution For Prompt Changes > 3 Dec 2025 To help teams collaborate on prompts without accidentally overwriting each other’s work, we’ve introduced session conflict resolution in the [prompt playground](/prompts/prompt-playground). Here’s what’s new: * You’ll now land on your last active session instead of the prompt’s latest session. * If there are newer sessions with changes that differ from yours, you’ll see an indicator next to the prompt name in the header, allowing you to review and merge updates. * The Merge Changes page allows you to inspect each conflicting change and decide whether to keep your version or accept incoming updates. Conflicts can be resolved immediately or deferred until a [prompt version](/prompt-engineering/prompt-versions) is published, ensuring the final prompt includes all relevant changes from you and your teammates. Read [docs](https://www.getmaxim.ai/docs/prompts/prompt-sessions#resolve-prompt-session-conflicts). Collaborative Conflict Resolution For Prompt Changes