I have conflicting files, what should I do?
Currently, the sync app has a very cautious approach, probably too much. It tries as much as possible not to overwrite one of your files with an older version. As soon as it has the slightest doubt, it creates a file suffixed by `conflict` which contains a copy of your