Adding a new client in Sync mode sometimes causes SETTINGS.md conflict

[mufeedali]

This isn't consistently reproducible but it happens sometimes.

• The conflict document with the revision at the end is the correct one with my changes.
• The SETTINGS.md file has the placeholder default settings.

Could be related to server restarts, not sure yet.

Just documenting this here until I can test more.