Add basic conflict handling to sync proxy.