Change ConflictDialog