Alteracao layout
resolucao de conflito