Embodiments of the present disclosure include systems and methods of conflict resolution, retry condition management and/or handling of problem files in the synchronization architecture of the cloud-based platform. One embodiment of the disclosed technology detects conflicts between incompatible changes made on opposite file systems based on file system sync results when executing a sync event on the file system. In one embodiment, the disclosed technology applies self-healing strategies when unexpected failures occur. For example, if a synchronization action fails repeatedly, an external action (e.g., from user, file system, etc.) can return the system back to a consistent state again.