corecturi
verificat text
fixed merge conflicts
another mil conflicts