Merge Conflict

An error has occurred during the merge attempt. Another user has changed the version of the asset that you are trying to merge and the merge cannot be completed correctly.

Click OK to return to Explorer.

Resolve the conflict manually and try the merge again.