Resolve conflict window hangs

I am having intermittent issues in saving my project in a multi-user development environment. The resolve conflict screen hangs.

strong text

Are you using the latest nightly build? There were a few fixes merged in that should have resolved this within the last week or two.

No, we have not updated since we installed the final version. We will try that. Thank you.