fix conflito linux