Resolve conflito 2.