Resolving Conflicted Copies

Hello,

I just started working on the cloud so another person could collaborate on making updates. However I noticed today after they finished working it created a conflicting copy. I want to make sure we don't lose our progress as it is more tedious updates and I don't want to accidently work off an old version or lose it. How do you avoid this and how do you resolve this. I have had no issue until they worked on the file. If there is a very simple process to follow please let me know as I don't know if the other person is very savy as the are newer to Adobe in general. I have a log AdobeLogs_20210429_115759_185-win.zip that I did just based off feedback in the forums so far.