Sorry, we were unable to merge the conflicting content changes and using the configured merge tool is not supported for this ...