Tentando resolver conflito