alt conflit test
resolvi conflito