eu am facut update si imi merge perfect