Alteracoes pdf
fixing conflicts