fix conflito