PR com conflitos resolvidos