Conflict repair