testu lui terentu
resolved conflict