Resolve Registry Sync conflicts