Compatibility with Settings Sync?

Microsoft's official settings sync feature is now in preview in VS Code stable, and it seems to have some issues with Platform Settings; I've been getting merge conflicts for the platform-specific settings when sync runs. Is there a way to make this plugin compatible?