---
schema_version: "1"
id: e6ae893798fb8ab858d6d0723b140d8e075d938df21c6f7f005c57279485870e
title: Resolve Merge Conflicts in Lifecycle Center
collection: admin
version: current
locale: en-us
portal_url: https://docs.salesforce.com/admin/current/en-us/platform/264-0-0/devops_center_next_gen_resolve_conflict.md
canonical_url: https://help.salesforce.com/s/articleView?id=platform.devops_center_next_gen_resolve_conflict.htm&release=264.0.0&type=5
source_site: help.salesforce.com
content_type: documentation
content_hash: a2d558f3d330a39a68cf02d333bf66283a4bbc7aa96c6e8bd6df8bfb533ea72b
description: Lifecycle Center uses Agentforce to streamline conflict resolution for both low-code admins and developers. By integrating with Agentforce Vibes, Lifecycle Center provides AI-assisted guidance whether you work in the UI or the IDE.
products:
  - Salesforce Platform
release: "264"
---
# Resolve Merge Conflicts in Lifecycle Center

Lifecycle Center uses Agentforce to streamline conflict resolution for both low-code admins and developers. By integrating with Agentforce Vibes, Lifecycle Center provides AI-assisted guidance whether you work in the UI or the IDE.

### Required Editions

<table class="slds-table slds-table_bordered slds-max-medium-table_stacked slds-m-bottom_small edition"><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Available in: Lightning Experience in <strong>Professional</strong> (API access required), <strong>Enterprise</strong>, <strong>Performance</strong>, <strong>Unlimited</strong>, and <strong>Developer</strong> Editions</td></tr></tbody><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Not Available in: <strong>Government Cloud Plus</strong>. Contact your Salesforce account executive for more details.</td></tr></tbody><colgroup><col></colgroup><tbody><tr class=""><td class="slds-cell-wrap" style="vertical-align:top;">Not available in: <strong>EU Operating</strong> Zone. EU Operating zone is a special paid offering that provides an enhanced level of data residency commitment. Lifecycle Center <em>is</em> supported in orgs in the EU that aren’t part of EU OZ, per standard product terms and conditions.</td></tr></tbody></table>

## Resolve Conflicts from the UI (Low-Code)

If you're a low-code developer or admin, use Lifecycle Center MCP tools to manage conflicts without writing commands. When Lifecycle Center detects a conflict during a promotion, the pipeline highlights the specific blocked work item with an error notification.

Click the **Resolve with Agentforce** button to automatically launch Agentforce Vibes IDE. Lifecycle Center preloads the specific error message and context into the prompt. You can interact with Agentforce to review the conflicting files and accept the recommended fixes.

![Resolve with Agentforce button in the pipeline](https://sf-zdocs-cdn-prod.zoominsoftware.com/tdta-platform-devops_center-264-0-0-production-enus/166010c3-4c34-4087-92ad-aea917baf524/devops_center/images/next_gen_resolve_agentforce.png)

## Resolve Conflicts Using Lifecycle Center MCP Tools

Use Lifecycle Center MCP tools to detect, analyze, and resolve conflicts programmatically. When working within Agentforce Vibes IDE, Agentforce automatically detects the merge conflict. It adds the error details to the prompt. Ask Agentforce Vibes to explain the differences between the files or suggest a solution.

#### See Also

- [Lifecycle Center MCP Tools and Skills](https://help.salesforce.com/s/articleView?id=platform.devops_center_mcp_tools.htm&release=264.0.0&type=5 "Accelerate your DevOps application lifecycle with Lifecycle Center MCP tools and skills. Use natural-language prompts in your IDE to interact with Lifecycle Center, or use skills to automate release workflows. MCP tools and skills simplify and standardize Lifecycle Center workflows.")