synced success icon with conflicts in file, and files not blacklisted after 3 trials

[Talank]

If I update a file simultaneously in the server and in desktop client, then the conflict arises. And this conflict does not disappears even though the file is properly synced (Sounds like expected behavior). However, 2 unnatural behavior was observed.

1) File is not blacklisted even after 3 trials

Ref: #9290 (comment)

2) There is a check mark (commonly means no conflicts) even if the conflicte

d copy file is there

This scenario occurs if we force sync or if we pause and then resume sync. If we reload the desktop client then the conflict message reappears. The logs files in these two scenarios are as follows:

• force_sync.zip
• pause_and_resume_sync.zip