Title: Instant Conflict Resolution