fixes em orgao
fixing leis
fixing conflicts
resolving conflict with artz helpers