Resolve conflito