Resolve conflito 1