Solucao apos merge manual