---
nav: wcp_docs
parent_url: /wcp_docs/
title: Resolve Merge Conflicts in App Builder
layout: subsection
---

### Context

App Builder's Merge Conflict Manager detects and resolves updates and conflicts when the same application has been updated in both your active App Builder session and in App Hub. When you save your app to App Hub or open a new App Builder session, App Builder checks whether the Extend components of the app you are editing have also been updated in App Hub. If updates are available, App Builder notifies you.

-   <b>Saving to App Hub with updates available in App Hub</b>: If updates are available in App Hub while you are saving to App Hub, App Hub displays a <b>Cannot Save to App Hub</b> message. You must either apply those updates to your session, or overwrite App Hub with your current session changes before saving to App Hub.

-   <b>Opening a new session with updates available in App Hub</b>: If updates are available in App Hub while opening a new session in App Builder, App Builder displays an <b>Updates Available in App Hub</b> notification in the top App Builder toolbar. This notification may take a few seconds to display after the session loads. You can apply updates at any time during your session by clicking on the notification button. You must either apply updates or overwrite App Hub before saving to App Hub.

    <b>Note:</b> Workday displays the <b>Updates Available in App Hub</b> notification in the middle of session development if you refocus your browser.

-   <b>Viewing changes in App Hub</b>: To review what was changed in App Hub before applying changes, select <b>Updates Available in App Hub</b>, then click <b>View Changes</b>. App Hub displays a read-only code comparison between the latest App Hub version and the previous version of the app.

-   <b>Applying updates from App Hub</b>: Click <b>Apply Updates</b> to incorporate the latest changes from App Hub into your session automatically.

-   <b>Resolving merge conflicts</b>: Merge conflicts will occur after you click <b>Apply Updates</b> if the same lines of code within the components were modified in both App Hub and your session. In that case, Extend will prompt you to resolve merge conflicts. The <b>Apply</b> button remains disabled until you resolve all conflicts across every affected component.

    For each conflict, you may choose how to resolve it:

    -   <b>Use App Hub</b>: Overwrites the conflicted code with the latest App Hub version.
    -   <b>Use Your Session</b>: Overwrites the conflicted code with your current session.
    -   <b>Use Both</b>: Overwrites the conflicted code with a combination of the code from both App Hub and your session.

-   <b>Completing merge conflict resolution</b>: Once all conflicts are resolved, click <b>Apply</b> to finalize your merge conflict resolutions.



### Next Steps

After applying updates and resolving any merge conflicts, continue editing your app in your session as usual. Applying updates via Merge Conflict Manager doesn't update your app in App Hub unless you selected <i>Overwrite App Hub</i> in the <b>Cannot Save to App Hub</b> window.