Remote Conflict Resolution