Instant Conflict Resolution